From: Jeffrey D. Oldham <oldham@gcc.gnu.org>
Date: Wed, 10 Jan 2001 00:51:39 +0000 (+0000)
Subject: Remove unintentional merge indicators.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c4923b10a80fda0edd35e2bab3749672f697e855;p=gcc.git

Remove unintentional merge indicators.

From-SVN: r38845
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8c43e6ce5a8..ba17bf6b9c6 100644
--- 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.