From: Mats Bengtsson <mats.bengtsson@s3.kth.se>
Date: Wed, 9 Apr 2003 12:03:37 +0000 (+0000)
Subject: 	* Documentation/topdocs/AUTHORS.texi (AUTHORS): Updated contact
X-Git-Tag: release/1.7.16~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e9ab93062d91ef7834d9cbbe0a09a836ec7b3ef7;p=lilypond.git

	* Documentation/topdocs/AUTHORS.texi (AUTHORS): Updated contact
	information.
---

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,