Module Name: src Committed By: christos Date: Fri Jun 30 11:55:56 UTC 2017
Modified Files:
src/doc: CHANGES
Log Message:
remove merge conflict part.
To generate a diff of this commit:
cvs rdiff -u -r1.2294 -r1.2295 src/doc/CHANGES
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
