From a71b20e2ae6aed2f158bd7292695d9bb271c7a4e Mon Sep 17 00:00:00 2001
From: "Kim F. Storm" <storm@cua.dk>
Date: Mon, 1 Jan 2007 16:04:13 +0000
Subject: *** empty log message ***

---
 man/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'man')

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,
-- 
cgit v1.2.1