From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 24 Jun 1998 23:09:05 +0000 (+0000)
Subject: remove CVS conflict marker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9154d6889d01f3cc0f44ccf92c543cbdbc242c35;p=binutils-gdb.git

remove CVS conflict marker
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4e314c465fa..5648ee0c969 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -42,7 +42,6 @@ end-sanitize-v850e
 	* config/obj-coff.c (c_symbol_merge): Replace complex expresion
 	with call to macro SYM_AUXINFO.
 
->>>>>>> 1.2596
 Tue Jun 23 15:09:27 1998  Mike Stump  <mrs@wrs.com>
 
 	* Makefile.am (install-exec-local): Don't let EXEEXT interfere