*** empty log message ***

1 files changed, 0 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96001bea65a..8d834cbcd83 100644
--- 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,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
-=======
 2002-07-21  Kai Gro,A_(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