From: Gerald Pfeifer <gerald@gcc.gnu.org>
Date: Thu, 9 Nov 2000 08:48:30 +0000 (+0000)
Subject: * Remove overlooked conflict marker.
X-Git-Tag: prereleases/libstdc++-2.92~3126
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=54d87db8696d7dd6307ba7f5e54ec27a22d42348;p=gcc.git

* Remove overlooked conflict marker.

From-SVN: r37337
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c6f2dfcb8e5..5f1bd775139d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -83,7 +83,6 @@ Wed Nov  8 21:53:41 MET 2000  Jan Hubicka  <jh@suse.cz>
 	* expr.c (expand_expr) [ADDR_EXPR]: Handle when op0 is RETURN_DECL
 	passed in multiple non-contiguous locations.
 
->>>>>>> 1.8198
 2000-11-08  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 	
 	* README.gnat: Remove file.