From 0a0a4a843c624b07daa2beec961750d7b7337b20 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sat, 13 Apr 2002 11:26:32 +0000
Subject: [PATCH] duh

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.39.5