From aa5f4ad8ef03d28615e0460788e0c4e3a8373122 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sun, 7 May 2000 14:13:21 +0000
Subject: Removed conflict marker.

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

diff --git a/ChangeLog b/ChangeLog
index 3e7d24f679..9332cba808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1373,7 +1373,6 @@
 	* sysdeps/mips/dl-machine.h: Update some comments.
 	(ELF_MACHINE_ALIGN_MASK): Removed, it's not needed.
 
->>>>>>> 1.3514
 2000-04-11  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/posix_opt.h: Add
-- 
cgit 1.4.1