Fixed conflict in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-08-10 10:49:50 -04:00
2 changed files with 20 additions and 4 deletions

View File

@@ -19933,3 +19933,9 @@
2020-08-05 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression with "Scheduler Code:" label overlapping "Group"
combobox in rdlibrary(1).
2020-06-23 Fred Gleason <fredg@paravelsystems.com>
* Applied the RD_MAX_CART_NUMBER define in
'rdairplay/local_macros.cpp'.
2020-08-10 Brian McGlynn <bmcglynn@geneseemedia.net>
* Allow RN Macro to run when Rivendell daemons running as non-root
'ripcd/local_macros.cpp'.