diff options
| author | Andreas Schwab <schwab@gcc.gnu.org> | 2005-10-12 13:40:05 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2005-10-12 13:40:05 +0000 |
| commit | 985943dfe64b14493be29f112a62d1fc9ead7186 (patch) | |
| tree | 770034cb1206345f862c81b0eb95114ceed0d12b /gcc | |
| parent | 39e837db6aa45f28e5c1fe314b16d1dcaa8c99ab (diff) | |
| download | gcc-985943dfe64b14493be29f112a62d1fc9ead7186.zip gcc-985943dfe64b14493be29f112a62d1fc9ead7186.tar.gz gcc-985943dfe64b14493be29f112a62d1fc9ead7186.tar.bz2 | |
Remove conflict marker.
From-SVN: r105301
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 941007b..4d78b4d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -50,7 +50,6 @@ Only apply the optimization for rounding builtins if the inner cast is also an extension. ->>>>>>> 2.10143 2005-10-11 Andrew Pinski <pinskia@physics.uc.edu> PR tree-opt/23946 |