From: Alan Modra <amodra@gmail.com>
Date: Fri, 10 Jun 2005 00:41:30 +0000 (+0000)
Subject: remove conflict indicator
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=80f564490031cd5ffd14617ca2fa126e44922ec4;p=deliverable%2Fbinutils-gdb.git

remove conflict indicator
---

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.