# HG changeset patch
# User Eric Blake <ebb9@byu.net>
# Date 1189691538 0
# Node ID 09cf746577d7a706d1970514b98256836d40329e
# Parent  c3c134042c0b3c21715ff56abe3cd6f5b30a07f0
* ChangeLog: Remove conflict markers.

diff --git a/ChangeLog b/ChangeLog
--- 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 @@
   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