From 000f4f854f40b51f082575366ea41d3d7d8777b5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 21 Apr 2013 14:34:06 +0100
Subject: Remove old merge tag.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ChangeLog')

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>
 
-- 
cgit v1.2.3