Remove conflict marker

From-SVN: r183008

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22fb1bd0944be97c2df390d4f4f34a199e0e62a5..dd524b255f0a9df138a1e1964b14466cdaaeab93 100644 (file)
--- 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