* ChangeLog: Remove conflict markers.

diff --git a/ChangeLog b/ChangeLog
index ed569a9cf26af44237b2db383e80e8aab52e3f9c..3e94c6d58fa461a542f7268a064420764f1b2915 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-13  Eric Blake  <ebb9@byu.net>
+
+       * ChangeLog: Remove conflict markers.
+
 2007-09-13  Simon Josefsson  <simon@josefsson.org>
 
        * lib/gc-gnulib.c (gc_hash_open): Catch NULL calloc return value.
@@ -33010,9 +33014,6 @@
 
        * m4/isc-posix.m4: New file.
 
-<<<<<<< ChangeLog
-1998-05-10  Jim Meyering  <meyering@ascend.com>
-=======
 1998-05-10  Jim Meyering  <meyering@ascend.com>
 
        * m4/jm-mktime.m4: Use AM_FUNC_MKTIME, now that it's up to date.
@@ -33091,4 +33092,3 @@ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
 Copying and distribution of this file, with or without modification,
 are permitted provided the copyright notice and this notice are preserved.
->>>>>>> 1.1932