From 291c622da4849dba360a6dbb45401f3c2eaacaa1 Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Thu, 12 May 1994 18:13:17 +0000 Subject: [PATCH] Remove CVS conflict markers from file --- bfd/ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 43eed1f62e6..cd1fc3cc6fa 100644 --- 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. -- 2.30.2