* Remove overlooked conflict marker.

From-SVN: r37337

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c6f2dfcb8e5102a013456fdcc2b7796184e973e..5f1bd775139d95768d280d7387b107452c055343 100644 (file)
--- 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.