Remove conflict marker

From-SVN: r183008

Remove conflict marker
From-SVN: r183008
d18a0a84 · Richard Biener · a7f45047 · d18a0a84
Commit d18a0a84 authored 13 years ago by Richard Biener
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
@@ -135,7 +135,6 @@
 	* cfgloopmanip.c (remove_path): Walk loop hiearchy upwards when
 	unlooping loops.

->>>>>>> .r182937
 2012-01-05  Richard Guenther  <rguenther@suse.de>

 	PR lto/50490