1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2086314..d4c707f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 1998-04-23 22:43  Ulrich Drepper  <drepper@cygnus.com>
 
 	* elf/dl-load.c (fillin_rpath): Handle empty element returned by