From: Graham Percival <graham@percival-music.ca>
Date: Sat, 8 Jan 2005 22:19:53 +0000 (+0000)
Subject: Removing CVS conflict mark from a bad commit.
X-Git-Tag: release/2.5.14~281
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7684f0d2a9efe5715baea78ebe8c731a5e22a2d0;p=lilypond.git

Removing CVS conflict mark from a bad commit.
---

diff --git a/ChangeLog b/ChangeLog
index b87e3619e0..6fada4cd71 100644
--- 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).