Commit d18a0a84 by Richard Biener

Remove conflict marker

From-SVN: r183008
parent a7f45047
...@@ -135,7 +135,6 @@ ...@@ -135,7 +135,6 @@
* cfgloopmanip.c (remove_path): Walk loop hiearchy upwards when * cfgloopmanip.c (remove_path): Walk loop hiearchy upwards when
unlooping loops. unlooping loops.
>>>>>>> .r182937
2012-01-05 Richard Guenther <rguenther@suse.de> 2012-01-05 Richard Guenther <rguenther@suse.de>
PR lto/50490 PR lto/50490
......
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