From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 13 Apr 2003 09:19:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/1.6.10~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bd8df60e30c4ba0556e36cea5a582e3795647f27;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index f16f90cd8f..3a449388f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,7 +43,6 @@
 
 	* mf/feta-beugel.mf (code): backport brace fix from 1.7
 
->>>>>>> 1.482.2.132
 2003-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* Backport: