From 4204866c6a5a634c0976b87c5f611522dfe10647 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 31 Oct 2004 00:07:35 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/ChangeLog b/ChangeLog
index dd93027ed2..7aed75b7a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,7 +67,6 @@
 	* scm/lily.scm (ly:system): new function. Catches uninstalled
 	ps2png.
 
->>>>>>> 1.2778
 2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* Documentation/user/notation.itely: remove
-- 
2.39.5