remove conflict indicator

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 977e4c933797d749c7bdc12168f1f5b92211f42d..de119d6b1334b374af9f8e74b04ad48a232116d5 100644 (file)
--- 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.