From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 2 Nov 2006 13:09:44 +0000 (+0100)
Subject: remove merge debris
X-Git-Tag: release/2.10.0-2~34^2~29
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ecb813503b696ed9ed2faad7e2ba535bcd86c672;p=lilypond.git

remove merge debris
---

diff --git a/ChangeLog b/ChangeLog
index be4a778f17..203ff58d4b 100644
--- 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