projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7e6d1d)
Remove conflict marker.
authorAndreas Schwab <schwab@gcc.gnu.org>
Fri, 1 Jun 2007 08:51:05 +0000 (08:51 +0000)
committerAndreas Schwab <schwab@gcc.gnu.org>
Fri, 1 Jun 2007 08:51:05 +0000 (08:51 +0000)
From-SVN: r125260

ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 2c65050cac484f721502462ee30a17dcfb1fbcd5..1acce9d669ad7bf2234e555b4edff0171c872b94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -468,7 +468,6 @@
        install-gcc.
        * Makefile.in: Regenerate.
 
->>>>>>> .merge-right.r70
 2006-12-04  Richard Guenther  <rguenther@suse.de>
 
        * MAINTAINERS (Non-Algorithmic Maintainers): New section.