*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96001bea65aae08df0aedd54db74da54caa4a9e2..8d834cbcd836b2510d011c639f2a5ec9af275874 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -161,7 +161,6 @@
        (reftex-parse-bibtex-entry): Use `reftex-syntax-table-for-bib'.
        (reftex-with-special-syntax-for-bib): new macro.
 
-<<<<<<< ChangeLog
 2002-07-21  Richard M. Stallman  <rms@gnu.org>
 
        * international/ucs-tables.el (ucs-quail-activate):
@@ -170,10 +169,7 @@
        * bindings.el (last-buffer): Use buffer-list with frame arg.
        Create *scratch* if no other choice exists.  Fix bugs. 
 
-2002-07-21  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-=======
 2002-07-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
->>>>>>> 1.4146
 
        * net/tramp.el: Bump version to 2.0.2.
        (tramp-methods): Rename methods invoking "ssh1" or "ssh2" to