Removing CVS conflict mark from a bad commit.

diff --git a/ChangeLog b/ChangeLog
index b87e3619e03d3f966a7dbae0cfb5b3c881867683..6fada4cd71ce82363fe5a3808fe5943d027fab61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,6 @@
 
        * lily/score-engraver.cc (MUSIC_FONT): Use emmentaler20.
 
->>>>>>> 1.3039
 2005-01-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).