Fixed conflict in 'ChangeLog'

This commit is contained in:
Fred Gleason
2019-12-23 11:13:21 -05:00
2 changed files with 3 additions and 1 deletions

View File

@@ -19366,6 +19366,8 @@
2019-12-20 Fred Gleason <fredg@paravelsystems.com>
* Added additional debugging messages to the 'Local Audio Adapter'
driver in ripcd(8).
2019-12-20 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.0int9.
2019-12-20 Fred Gleason <fredg@paravelsystems.com>
* Added a debugging message to the 'LocalAudio::pollData()' method
in ripcd(8).