*** empty log message ***

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 3b7eb8c456093352ac38e9ceca08e1c600269696..f45c5819466e02e3e61dd1abe7067e517076d994 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -1,5 +1,8 @@
 Tasks needed before the next release.
 
+* UPDATE COPYRIGHTS (Happy New Year :-)
+
+
 * TO BE DONE SHORTLY BEFORE RELEASE
 
 ** Check for widow and orphan lines in manuals;
@@ -8,7 +11,6 @@ make sure all the pages really look ok in the manual as formatted.
 ** Check for text in manuals that assumes current version is 21.
 
 ** Update AUTHORS.
-[Done 2006-10-03]
 
 ** Regenerate the postscript files of the reference cards in etc.
 

diff --git a/man/ChangeLog b/man/ChangeLog
index 1404658209ecdeedfdcf531ff4edb8a67a83c37a..6d2dfc2fbc77129831dd1fc677e9ccb05cd46d38 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -53,7 +53,6 @@
        (IMAP): Document nnimap-search-uids-not-since-is-evil and
        nnimap-nov-is-evil.
 
->>>>>>> 1.1170
 2006-12-27  Eli Zaretskii  <eliz@gnu.org>
 
        * msdog.texi (Windows Keyboard): Mention widespread Windows bindings,