Remove old merge tag.

diff --git a/ChangeLog b/ChangeLog
index 4caba4a856a556254091f77b6dd3f19df7c82429..bbd1966f8b37c510e22534cdaae2bbeffa2cb83b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -521,7 +521,6 @@
 2012-12-18  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.65 released.
->>>>>>> master
 
 2012-12-13  Carl Hetherington  <cth@carlh.net>