Oops, remove conflict marker

From-SVN: r34406

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb06dc2eb9d850a3032f33ac9002b714becb5220..6158fc7cfea172d7bdeccf3691a965fff534024d 100644 (file)
--- 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