Commit 1795c28e by Jakub Jelinek

Remove >>>> marker.

From-SVN: r175243
parent 2ad97a1e
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment