From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 6 Feb 2002 16:24:25 +0000 (+0000)
Subject: Remove traces of merge conflicts.
X-Git-Tag: ttn-vms-21-2-B4~16817
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=262d4e892d2c8fd993f04b404fe06c2897e3c5ca;p=emacs.git

Remove traces of merge conflicts.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92bfde23736..3e63bc5c0c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -121,7 +121,6 @@
 	(showhide-date-time): New function.
 	(menu-bar-showhide-menu): New menu-item "Date and time".
 
->>>>>>> 1.3409
 2002-02-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* mail/rmail.el (rmail): Use find-buffer-visiting instead of
@@ -144,7 +143,6 @@
 	* dabbrev.el (dabbrev--goto-start-of-abbrev):
 	Exit loop on beginning of field rather than bobp.
 
->>>>>>> 1.3400
 2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* mail/uce.el (uce-reply-to-uce): Prune the headers before copying
@@ -202,7 +200,6 @@
 
 	* hi-lock.el (hi-lock-find-patterns): Save restriction.
 
->>>>>>> 1.3396
 2002-02-01  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* calendar/time-date.el: Moved from lisp/gnus.
@@ -259,7 +256,6 @@
 	New functions (separated from command-line-1).
 	(command-line-1): Use them.
 
->>>>>>> 1.3390
 2002-01-28  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* calendar/calendar.el (generate-calendar-month): Doc fix.