From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 12 May 2005 12:08:08 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.24~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b0101c99da839a1a3c64fe612fbcdc2ab52c77e3;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 8dcbd8eaad..25911ce9b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,7 +53,6 @@
 	* input/test/volta-chord-names.ly: Bring the explanation up to
 	date.
 
->>>>>>> 1.3600
 2005-05-11  Heikki Junes  <hjunes@cc.hut.fi>
 
         * Documentation/topdocs/{AUTHORS.texi,INSTALL.texi,README.texi}: