*** empty log message ***

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