duh

diff --git a/ChangeLog b/ChangeLog
index bf5d8fa7a441b0464f1d7856d96487219dd9ebe1..7788a963b32d541a42a81c4786188011ea4bcf9f 100644 (file)
--- 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