Fix ChangeLog conflicts

This commit is contained in:
Patrick Linstruth 2019-08-29 09:05:48 -07:00
parent a5751a3f73
commit c1c0c09584

View File

@ -19037,9 +19037,6 @@
* Fixed a bug in rdlogmanager(1) that caused newly added events * Fixed a bug in rdlogmanager(1) that caused newly added events
to be incorrectly sorted in the event list in the 'Edit Clock' to be incorrectly sorted in the event list in the 'Edit Clock'
dialog. dialog.
2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Modified caed(8) to skip JACK startup, rather than crash, if
no command line is specified in rdadmin(1).
2019-08-28 Patrick Linstruth <patrick@deltecent.com> 2019-08-28 Patrick Linstruth <patrick@deltecent.com>
* Added 'pypad_httpget.py' script. * Added 'pypad_httpget.py' script.
2019-08-28 Patrick Linstruth <patrick@deltecent.com> 2019-08-28 Patrick Linstruth <patrick@deltecent.com>