mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-10 16:43:35 +02:00
Resolved conflict in 'ChangeLog'
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -20,7 +20,10 @@
|
||||
|
||||
EXTRA_DIST = PACKAGE_VERSION\
|
||||
README.txt\
|
||||
RIVWEBPYAPI_VERSION
|
||||
RIVWEBPYAPI_VERSION\
|
||||
RIVWEBCAPI_AGE\
|
||||
RIVWEBCAPI_CURRENT\
|
||||
RIVWEBCAPI_REVISION
|
||||
|
||||
CLEANFILES = *~
|
||||
MAINTAINERCLEANFILES = *~\
|
||||
|
Reference in New Issue
Block a user