From: Zack Weinberg <zack@gcc.gnu.org>
Date: Mon, 5 Jun 2000 17:00:32 +0000 (+0000)
Subject: Oops, remove conflict marker
X-Git-Tag: prereleases/libstdc++-2.92~5957
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83adf9da649087e9289af876fc4c4b47d0e96b62;p=thirdparty%2Fgcc.git

Oops, remove conflict marker

From-SVN: r34406
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb06dc2eb9d8..6158fc7cfea1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -37,7 +37,6 @@
 	* c-parse.y, c-parse.c, c-parse.h: Regenerate.
 	* objc/objc-parse.y, objc/objc-parse.c: Regenerate.
 
->>>>>>> 1.6841
 Mon Jun  5 06:46:28 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* alias.c (get_alias_set): If compnent is addressable, use alias