Mercurial > emacs
diff man/ChangeLog @ 75021:f20bb2fb51a2
*** empty log message ***
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Mon, 01 Jan 2007 16:04:13 +0000 |
parents | 61482036b5b2 |
children | 7b9860c75a21 |
line wrap: on
line diff
--- a/man/ChangeLog Mon Jan 01 15:20:33 2007 +0000 +++ b/man/ChangeLog Mon Jan 01 16:04:13 2007 +0000 @@ -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,