Resolved conflict in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-12-21 13:39:34 -05:00
2 changed files with 6 additions and 1 deletions

View File

@@ -20,7 +20,10 @@
EXTRA_DIST = PACKAGE_VERSION\
README.txt\
RIVWEBPYAPI_VERSION
RIVWEBPYAPI_VERSION\
RIVWEBCAPI_AGE\
RIVWEBCAPI_CURRENT\
RIVWEBCAPI_REVISION
CLEANFILES = *~
MAINTAINERCLEANFILES = *~\