Typos.

diff --git a/ChangeLog b/ChangeLog
index 7b8bd24ff86bac55abb87ff59ae723166ae55315..a8513e98e09a5461cf1724dfd11cb9b308f37639 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,6 @@
        * acfunctions.m4 (AC_FUNC_ERROR_AT_LINE, AC_FUNC_ONSTACK): Use
        AC_LIBSOURCES.
 
-       
 2001-02-03  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_LIBOBJ_DECL): Remove.
@@ -11,7 +10,6 @@
 
        * acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Remove configure.ac
 
-<<<<<<< ChangeLog
 2001-02-02  Akim Demaille  <akim@epita.fr>
 
        * tests/base.at (AC_TRY_COMMAND): Fix the test.
@@ -25,7 +23,6 @@
        Reported by Tim Van Holder.
        * tests/base.at (AC_TRY_COMMAND): New.
 
-=======
 2001-02-02  Pavel Roskin  <proski@gnu.org>
 
        * acgeneral.m4 (_AC_COMPUTE_INT_COMPILE): Rename all occurences
@@ -40,7 +37,6 @@
        (scan_sh_file): Likewise.
        Thanks to Jim Meyering for improved implementation.
 
->>>>>>> 1.1270
 2001-02-01  Pavel Roskin  <proski@gnu.org>
 
        * autoreconf.sh: Fix the case when the verbose output was not