From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 13 Apr 2002 11:26:32 +0000 (+0000)
Subject: duh
X-Git-Tag: release/1.5.53~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=83ff577df328eb943e05c8e442d7eb62a4982c2b;p=lilypond.git

duh
---

diff --git a/ChangeLog b/ChangeLog
index bf5d8fa7a4..7788a963b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,7 +53,6 @@
 	* scripts/lilypond-book.py (LatexPaper.set_geo_option): Simplify
 	and correct the handling of geometry options.
 
->>>>>>> 1.75
 2002-04-10  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* lily/include/grob-interface.hh (ADD_INTERFACE): make