Fixed conflict in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-06-17 08:06:01 -04:00
2 changed files with 21 additions and 3 deletions

View File

@@ -20770,3 +20770,5 @@
the Rivendell services are not running.
2021-06-06 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.6.1.
2021-06-17 Daniel Bair <daniel@danielbair.com>
* Update to support system dark themes 'rdairplay/loglinebox.cpp'.