Commit 262d4e89 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Remove traces of merge conflicts.

parent 108eaabb
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment