Module Name: src Committed By: christos Date: Mon Jun 5 19:17:59 UTC 2017
Modified Files:
src/doc: CHANGES
Log Message:
remove the conflict.
To generate a diff of this commit:
cvs rdiff -u -r1.2288 -r1.2289 src/doc/CHANGES
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
