From: Werner Lemberg <wl@gnu.org>
Date: Fri, 9 Dec 2005 01:54:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.7.23~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f88ef3c90f770a207caab5c2af13a64df1244d41;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index 7611299e82..82318adeb4 100644
--- 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