From: Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org>
Date: Sat, 16 Dec 2000 08:16:09 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: prereleases/libstdc++-2.92~2197
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=a472a8887b00197b000168866e8cb278b119c044;p=gcc.git

Remove conflict marker.

From-SVN: r38303
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 88fbe054d009..c28b22e48d36 100644
--- 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.