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

	information.

diff --git a/ChangeLog b/ChangeLog
index c880309ae33507e074245f5b93b731e3fe727703..4f0597510e63672569eb4b6fb5fcc85a60dac099 100644 (file)
--- 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,