Commit 7ce3c466 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

Remove conflict markers.

parent 9827d1ab
......@@ -2,12 +2,10 @@
* org.texi: Version 3.14
<<<<<<< ChangeLog
2005-07-04 Carsten Dominik <dominik@science.uva.nl>
* org.texi: Version 3.13
=======
2005-07-19 Juri Linkov <juri@jurta.org>
* files.texi (Comparing Files): Mention resync for `compare-windows'.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment