From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 12 Sep 2003 10:35:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/1.9.6~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=716a5b839e672e5cd9181d78b583154c32b3e2fc;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index bf4ad56a15..be2b2f2d19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,7 +35,6 @@
 	shortened to avoid almost-collision with staff line; code cleanup;
 	other custodes: fixed char boxes; code cleanup
 
->>>>>>> 1.1333
 2003-09-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* scripts/lilypond.py (global_latex_preamble): only set