summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2007-01-01 16:04:13 +0000
committerKim F. Storm <storm@cua.dk>2007-01-01 16:04:13 +0000
commita71b20e2ae6aed2f158bd7292695d9bb271c7a4e (patch)
tree27eed653962b3b85f313c1cec73ac2d66e28faa0 /man
parent3fcd018655f556a9949f4340589b552a7be26508 (diff)
downloademacs-a71b20e2ae6aed2f158bd7292695d9bb271c7a4e.tar.gz
*** empty log message ***
Diffstat (limited to 'man')
-rw-r--r--man/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 1404658209e..6d2dfc2fbc7 100644
--- 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,