From 25da58274f3b2c8ff61315014b3a8c1eba3070ca Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@bigpond.net.au>
Date: Fri, 10 Jun 2005 00:41:30 +0000
Subject: [PATCH] remove conflict indicator

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

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 977e4c9337..de119d6b13 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -103,7 +103,6 @@
 	* emultempl/ppc64elf.em (ppc_before_allocation): Use
 	one_lang_size_sections_pass.
 
->>>>>>> 1.1366
 2005-06-08  Aldy Hernandez  <aldyh@redhat.com>
 
 	* emulparams/elf32ms1.sh: New.
-- 
2.11.0