Fixed conflict in 'ChangeLog'

This commit is contained in:
Fred Gleason
2019-04-22 16:46:44 -04:00
2 changed files with 4 additions and 1 deletions

View File

@@ -18579,3 +18579,6 @@
2019-04-22 Fred Gleason <fredg@paravelsystems.com>
* Modified 'rivendell.spec.in' to pin the Python version used on
RHEL 7 to 3.4.
2019-04-22 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdimport(1) that broke the
"--set-daypart-times" argument.