diff options
| author | Nathan Sidwell <nathan@gcc.gnu.org> | 2001-01-18 14:27:06 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2001-01-18 14:27:06 +0000 |
| commit | 90deb75dfb8d7807a4bc480448f0c35529f467c7 (patch) | |
| tree | 73c9c23ace386a204dd5571c1aed040fdc5ece34 /gcc | |
| parent | f5ceeec84f7ef85b96400b54d0e2276a0c0a2ef7 (diff) | |
| download | gcc-90deb75dfb8d7807a4bc480448f0c35529f467c7.zip gcc-90deb75dfb8d7807a4bc480448f0c35529f467c7.tar.gz gcc-90deb75dfb8d7807a4bc480448f0c35529f467c7.tar.bz2 | |
Remove extraneous conflict indicator
From-SVN: r39122
Diffstat (limited to 'gcc')
| -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 2bb910f..cd36903 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -39,7 +39,6 @@ * gcc.c-torture/compile/20010117-1.c: New test. * gcc.c-torture/compile/20010117-2.c: New test. ->>>>>>> 1.1023 2001-01-15 Toon Moene <toon@moene.indiv.nluug.nl> * g77.f-torture/execute/20010116.[fx]: New test, |