Remove >>> conflict indicator.

From-SVN: r92148
This commit is contained in:
Jeff Law 2004-12-14 10:46:11 -07:00
parent 0c690ca7af
commit 0a96f3c694

View File

@ -71,7 +71,6 @@
PR middle-end/18903
* gcc.c-torture/compile/pr18903.c: New test.
>>>>>>> 1.4750
2004-12-10 Richard Sandiford <rsandifo@redhat.com>
* gcc.c-torture/execute/20041210-1.c: New test.