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 2e947eaed20c20a4e450cb2244dac28b7fdc0b6b..e16a3125bee3e0ed421136db805e1272d0680ca5 100644 (file)
--- 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.