Commit c4923b10 by Jeffrey D. Oldham

Remove unintentional merge indicators.

From-SVN: r38845
parent 3ee816a4
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment