projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5ceeec)
Remove extraneous conflict indicator
authorNathan Sidwell <nathan@gcc.gnu.org>
Thu, 18 Jan 2001 14:27:06 +0000 (14:27 +0000)
committerNathan Sidwell <nathan@gcc.gnu.org>
Thu, 18 Jan 2001 14:27:06 +0000 (14:27 +0000)
From-SVN: r39122

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2bb910f6c1a05d8fcba2400ce6e1510ede1ef077..cd36903412662dcdc27b44052aaa511a8b2ecb6d 100644 (file)
--- 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,