summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-21 14:34:06 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-21 14:34:06 +0100
commit000f4f854f40b51f082575366ea41d3d7d8777b5 (patch)
tree95775b400c1bf865690f63cdaf6c74eea170eb10 /ChangeLog
parentbd58b201c3e45b44e804ce040cac9e6a8c26736e (diff)
Remove old merge tag.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
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>