resolving merge conflict

This commit is contained in:
Florent Peyraud
2022-12-23 08:16:25 +01:00
2 changed files with 16 additions and 0 deletions

View File

@@ -23846,5 +23846,8 @@
rddbmgr(8).
2022-12-21 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 4.0.0rc0int11.
2022-12-22 Fred Gleason <fredg@paravelsystems.com>
* Documented the '--check-log-line-ids' option in the rddbmgr(8)
man page.
2022-12-23 Florent Peyraud <florent@draceo.fr>
* Fix pypad lib which crashed when ProcessNullUpdates!=0 in conffile