From 1cad40aca6bf42b7756aa0f33fe05274a7f813fe Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Wed, 22 Jun 2005 07:36:03 +0000 Subject: [PATCH] Remove conflict markers. --- lisp/ChangeLog | 3 --- 1 file changed, 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1079129698e..2182c849166 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -580,7 +580,6 @@ variables, unless either `gtk' is boundp or this isn't a `windows-nt' build. ->>>>>>> 1.7817 2005-06-13 Lute Kamstra * abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and @@ -1488,7 +1487,6 @@ * simple.el (filter-buffer-substring): Fix typo in docstring. ->>>>>>> 1.7768 2005-05-31 Richard M. Stallman * progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE. @@ -1525,7 +1523,6 @@ * textmodes/tex-mode.el (tex-compile-commands, tex-compile) (tex-start-tex): Undo all but the last part of the 2005-05-28 change. ->>>>>>> 1.7646 2005-05-30 Glenn Morris * calendar/diary-lib.el (mark-included-diary-files): Only kill -- 2.39.2