*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index dd93027ed204c02987c0fdc73e14896374134722..7aed75b7a76026ba52a5ffb076807bdeaa379ecb 100644 (file)
--- 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