Remove conflict marker.

From-SVN: r38303

Remove conflict marker.
From-SVN: r38303
a472a888 · Kriang Lerdsuwanakij · 221c7a7f · a472a888
Commit a472a888 authored Dec 16, 2000 by Kriang Lerdsuwanakij
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/testsuite/ChangeLog
+0 -1

No files found.
--- 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.