From 0c1bbe4e47394a9ea9beba38eaa38e7da2a27bad Mon Sep 17 00:00:00 2001
From: lerdsuwa <lerdsuwa@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 16 Dec 2000 08:16:09 +0000
Subject: Remove conflict marker.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38303 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gcc/testsuite')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 88fbe054d00..c28b22e48d3 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.
-- 
cgit v1.2.1