remove merge debris

diff --git a/ChangeLog b/ChangeLog
index be4a778f17356759b64958ee14c3414a1ecd7c3d..203ff58d4b13d61eb3806cb1d801d5071331dca4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -346,7 +346,6 @@
 
        * flower/polynomial.cc (check_sol): no empty if bodies. 
 
-=======
 2006-10-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * stepmake/stepmake/po-vars.make: Resolve.
@@ -357,7 +356,8 @@
 
 2006-10-29  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
-       * buildscripts/git-update-changelog.py (main): write .msg and cvs command.
+       * buildscripts/git-update-changelog.py (main): write .msg and cvs
+       command.
 
        * scm/define-grobs.scm: 
        separation-items have width