From d18a0a84f639bf5c30d0044f2d6941fa2d0e1392 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenth@gcc.gnu.org>
Date: Mon, 9 Jan 2012 10:13:01 +0000
Subject: [PATCH] Remove conflict marker

From-SVN: r183008
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22fb1bd0944..dd524b255f0 100644
--- 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
-- 
2.30.2