Fixed conflict in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-01-07 14:55:04 -05:00
3 changed files with 13 additions and 35 deletions

View File

@@ -22862,3 +22862,8 @@
* Removed generation of the 'rivwebpyapi' RPM package.
2022-01-04 Fred Gleason <fredg@paravelsystems.com>
* Removed generation of the 'rivendell-pypad' RPM package.
2022-01-07 Fred Gleason <fredg@paravelsystems.com>
* Removed generation of the 'rivwebpyapi' DEB package.
2022-01-07 Fred Gleason <fredg@paravelsystems.com>
* Merged the 'rivendell-pypad' DEB package into the 'rivendell'
DEB package.