Resolved conflict in 'ChangeLog'

This commit is contained in:
Fred Gleason
2018-11-05 20:29:14 -05:00
10 changed files with 110 additions and 34 deletions

View File

@@ -17981,3 +17981,6 @@
* Tweaked parameters of the Systemd service file to provide for
more response startup of the 'rivendell' service after a system
restart.
2018-11-05 Patrick Linstruth <patrick@deltecent.com>
* Update macro editor in rdlibrary(1) to fix display of
"--- End of cart ---" item and improve buttons and permissions.