From: Nathan Sidwell <nathan@gcc.gnu.org>
Date: Mon, 21 Mar 2005 12:33:15 +0000 (+0000)
Subject: remove conflict indicators
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6058208b0cd6d6e5b2c1aba25502c362453d5d2;p=gcc.git

remove conflict indicators

From-SVN: r96790
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2e947eaed20..e16a3125bee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -495,7 +495,6 @@
 	(arc_rodata_string, TARGET_OPTIONS): Delete.
 	* config/arc/arc.opt: New file.
 
->>>>>>> 2.7930
 2005-03-17  Richard Henderson  <rth@redhat.com>
 
 	* doc/extend.texi (Weak Pragmas): New section.