Remove CVS conflict markers from file

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 43eed1f62e6b17d3036469168a55457f6a3e6606..cd1fc3cc6fafae492e0d2e6c9c23d86323ef1498 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -135,7 +135,6 @@ Thu May  5 15:40:47 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
        (mips_fix_hi16_s): Use bfd_is_com_section.
        (mips_howto_table_ext): Call mips_fix_jmp_addr for MIPS_RELOC_JMP.
 
->>>>>>> 1.1152
 Wed May  4 11:09:53 1994  Ian Lance Taylor  (ian@cygnus.com)
 
        Changed m68k-aout to set flags to 0; m68k-sunos still uses 1.