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 2f9b277ccd6a6c834418a32ed205b5ac0316670f..e55de493efc864d8ee1cb9a0000a1dcca25e87fb 100644 (file)
--- 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 593a2a453d0d4dc904204452997fda2f7912b5f8..5d0d27404b246c8aa5a1baa1c2c1a7bd280355c5 100644 (file)
--- 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.