Remove unintentional merge indicators.

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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8c43e6c..ba17bf6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -146,7 +146,6 @@
        * gcc.dg/format-xopen-1.c: Rename to gcc.dg/format/xopen-1.c.
        * gcc.dg/formatz-1.c: Rename to gcc.dg/format/z-1.c.
 
->>>>>>> 1.986
 2001-01-05  Alexandre Oliva  <aoliva@redhat.com>
 
        * gcc.c-torture/execute/991228-1.c: Take word endianness into
@@ -160,7 +159,6 @@
 
        * g++.old-deja/g++.pt/crash62.C: New test.
 
->>>>>>> 1.973
 2001-01-04  Richard Henderson  <rth@redhat.com>
 
        * gcc.dg/20000926-1.c: Update expected warnings.