From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Mar 2005 12:33:15 +0000 (+0000)
Subject: remove conflict indicators
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90b1ac0f5622d0d9dd2fc91d6864fd1bc148f343;p=thirdparty%2Fgcc.git

remove conflict indicators


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96790 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2e947eaed20c..e16a3125bee3 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.