Oops, remove conflict marker

From-SVN: r34406

Oops, remove conflict marker
From-SVN: r34406
83adf9da · Zack Weinberg · 88a19424 · 83adf9da
Commit 83adf9da authored Jun 05, 2000 by Zack Weinberg
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- 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