Remove conflict marker.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38303 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 88fbe05..c28b22e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -57,7 +57,6 @@
         * gcc.dg/cpp/redef2.c: Update.   
         * gcc.dg/cpp/skipping.c: New test. 
 
->>>>>>> 1.929
 2000-12-07  Geoffrey Keating  <geoffk@redhat.com>
 
        * g++.old-deja/g++.other/eh3.C: New testcase.