diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1265f2bb2..4acb99c4f 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -40,7 +40,6 @@
 	* org-colview.el (org-agenda-colview-summarize): Sort out some
 	confusion between properties and titles, which resulted in
 	agenda summaries not working if a title was set for a column.
->>>>>>> james/bugfixes:lisp/ChangeLog
 
 2009-11-24  Carsten Dominik  <carsten.dominik@gmail.com>