[Orgmode] [PATCH] Remove leftover merge separater line

[Bernt Hansen]

This was leftover from a previous merge and should be deleted
---
This patch is available at git://git.norang.ca/org-mode.git for-carsten

 lisp/ChangeLog |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1265f2b..4acb99c 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  <address@hidden>
 
-- 
1.6.6.rc0.54.gb073b