diff options
| author | Jeff Law <law@gcc.gnu.org> | 2004-12-14 10:46:11 -0700 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2004-12-14 10:46:11 -0700 |
| commit | 0a96f3c694d88ed9f0c97135ca67151540f9d66f (patch) | |
| tree | c3407e6940c087cc133ee103cca27f61f2ba70a8 /gcc/testsuite/ChangeLog | |
| parent | 0c690ca7afabc675d06b5b4f86899eff827c8eb9 (diff) | |
| download | gcc-0a96f3c694d88ed9f0c97135ca67151540f9d66f.zip gcc-0a96f3c694d88ed9f0c97135ca67151540f9d66f.tar.gz gcc-0a96f3c694d88ed9f0c97135ca67151540f9d66f.tar.bz2 | |
Remove >>> conflict indicator.
From-SVN: r92148
Diffstat (limited to 'gcc/testsuite/ChangeLog')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9a15271..18420bf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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. |