From d479b4ea1c90d71c19c070f3c8d6e870723b957f Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 24 Apr 1998 07:08:27 +0000
Subject: Update.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 2086314328..d4c707fcdd 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
-- 
cgit v1.2.3