projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ad97a1)
Remove >>>> marker.
authorJakub Jelinek <jakub@gcc.gnu.org>
Tue, 21 Jun 2011 08:15:36 +0000 (10:15 +0200)
committerJakub Jelinek <jakub@gcc.gnu.org>
Tue, 21 Jun 2011 08:15:36 +0000 (10:15 +0200)
From-SVN: r175243

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 235d40959ea22890d55c8a84cbbb72c975e246a0..e6c429f4ce9ae82ca29b53288d7610469f0ea7ce 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -66,7 +66,6 @@
 
        * regrename.c (do_replace): Don't update notes.
 
->>>>>>> .r175238
 2011-06-20  Alan Modra  <amodra@gmail.com>
 
        * config/rs6000/rs6000.c (create_TOC_reference): Wrap high part