*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 8dcbd8eaadadfbfa06a173582f3c51681badef07..25911ce9b6eac12d3a5f982f3d99c90f25cc24eb 100644 (file)
--- 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}: