1 files changed, 0 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4caba4a85..bbd1966f8 100644
--- 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>