From: Volker Reichelt <reichelt@gcc.gnu.org>
Date: Mon, 30 Jun 2003 21:17:05 +0000 (+0000)
Subject: Changelog: Remove ">>>>>>>" from previous change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f11c1f9089ef8be8221062cdd6ced02f84d8d9a4;p=gcc.git

Changelog: Remove ">>>>>>>" from previous change.

2003-06-30  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>

	* Changelog: Remove ">>>>>>>" from previous change.
	* testsuite/Changelog: Likewise.

From-SVN: r68741
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f9b277ccd6..e55de493efc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-30  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	* Changelog: Remove ">>>>>>>" from previous change.
+
 2003-06-30  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	* config/cris/cris.c: Fix spelling for "testcase".
@@ -164,7 +168,6 @@ Mon Jun 30 09:52:39 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	* config.gcc (sh*-*-kaos*): Put tm_file setting in separate case
 	statement from tmake_file set.
 
->>>>>>> 2.268
 2003-06-29  James E Wilson  <wilson@tuliptree.org>
 
 	* reload.c (find_reloads): Change push_reloads to push_reload in
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 593a2a453d0..5d0d27404b2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-30  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	* Changelog: Remove ">>>>>>>" from previous change.
+
 2003-06-30  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	* g++.old-deja/g++.niklas/README: Fix spelling for "testcase".
@@ -24,7 +28,6 @@
         PR c++/11106
         * g++.dg/other/error5.C: New test.
 
->>>>>>> 1.2819
 2003-06-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc.dg/format/gcc_diag-1.c: New test.