From a472a8887b00197b000168866e8cb278b119c044 Mon Sep 17 00:00:00 2001
From: Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org>
Date: Sat, 16 Dec 2000 08:16:09 +0000
Subject: [PATCH] Remove conflict marker.

From-SVN: r38303
---
 gcc/testsuite/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.
-- 
2.43.5