diff options
| author | Richard Biener <rguenth@gcc.gnu.org> | 2012-01-09 10:13:01 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2012-01-09 10:13:01 +0000 |
| commit | d18a0a84f639bf5c30d0044f2d6941fa2d0e1392 (patch) | |
| tree | a7f216fe1f0ddcc61c90275e2ca92c1c68662344 | |
| parent | a7f45047440d019d5cbd20629af5c2d526a33b4f (diff) | |
| download | gcc-d18a0a84f639bf5c30d0044f2d6941fa2d0e1392.zip gcc-d18a0a84f639bf5c30d0044f2d6941fa2d0e1392.tar.gz gcc-d18a0a84f639bf5c30d0044f2d6941fa2d0e1392.tar.bz2 | |
Remove conflict marker
From-SVN: r183008
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 22fb1bd..dd524b2 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 |