From e9ab93062d91ef7834d9cbbe0a09a836ec7b3ef7 Mon Sep 17 00:00:00 2001
From: Mats Bengtsson <mats.bengtsson@s3.kth.se>
Date: Wed, 9 Apr 2003 12:03:37 +0000
Subject: [PATCH] 	* Documentation/topdocs/AUTHORS.texi (AUTHORS):
 Updated contact 	information.

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

diff --git a/ChangeLog b/ChangeLog
index c880309ae3..4f0597510e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,7 +39,6 @@
 	* buildscripts/lys-to-tely.py (name2line): add <NAME> tags for
 	each file. 
 
->>>>>>> 1.821
 2003-04-04  Juergen Reuter  <reuter@ipd.uka.de>
 
 	* lily/include/custos.hh, make/lilypond.suse.spec.in,
-- 
2.39.5