*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 7611299e82d7c51cd1e8286fbf8be28db6dd617a..82318adeb4e66a27ef09f862388a84ce3000aae1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,7 +28,6 @@
        * Documentation/user/lilypond-book.itely: use `,´ after xref:
        See xref documentation, for example.
 
->>>>>>> 1.4331
 2005-12-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scripts/musicxml2ly.py (musicxml_voice_to_lily_voice): use