procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove traces of merge conflicts.

Browse source
This commit is contained in:
Eli Zaretskii 2002-02-06 16:24:25 +00:00
parent 108eaabb6b
commit 262d4e892d
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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.