From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 31 Oct 2004 00:07:35 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.4.2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4204866c6a5a634c0976b87c5f611522dfe10647;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index dd93027ed2..7aed75b7a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,7 +67,6 @@
 	* scm/lily.scm (ly:system): new function. Catches uninstalled
 	ps2png.
 
->>>>>>> 1.2778
 2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* Documentation/user/notation.itely: remove