From: Geoffrey Keating <geoffk@gcc.gnu.org>
Date: Tue, 18 Feb 2003 18:26:43 +0000 (+0000)
Subject: Remove conflict marker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dce53c70a455e6067fbe6e1b22c3afd9b2676d19;p=gcc.git

Remove conflict marker

From-SVN: r63048
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 57541bb6f66..96d1b0646bc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -176,7 +176,6 @@ Mon Feb  3 16:05:11 CET 2003  Jan Hubicka  <jh@suse.cz>
 	* gcc.c-torture/exectue/ieee/20000320-1.c: The ARM VFP format is
 	'natural-endian'.
 
->>>>>>> 1.2408
 2003-02-01  Richard Sandiford  <rsandifo@redhat.com>
 
 	* g++.dg/init/new1.C: Remove -fvolatile dg-options line.