diff options
| author | Pekka Jääskeläinen <visit0r@gcc.gnu.org> | 2017-05-04 05:56:32 +0000 |
|---|---|---|
| committer | Pekka Jääskeläinen <visit0r@gcc.gnu.org> | 2017-05-04 05:56:32 +0000 |
| commit | 2b4514101fc315ce7d069ff8476b2dd8251a4223 (patch) | |
| tree | e26fffca2dc3d64f071375c3ba33bbbe4efe453e | |
| parent | c6e334cdb1177c9722cef5e5f7153986edd5e5d3 (diff) | |
| download | gcc-2b4514101fc315ce7d069ff8476b2dd8251a4223.zip gcc-2b4514101fc315ce7d069ff8476b2dd8251a4223.tar.gz gcc-2b4514101fc315ce7d069ff8476b2dd8251a4223.tar.bz2 | |
Removed accidentally committed conflict marker.
From-SVN: r247577
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8ab62c6..6a7bda4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -76,7 +76,6 @@ * ipa-inline.h (inline_summary): Add ctor. (create_ggc): Do not use ggc_cleared_alloc. ->>>>>>> .r247575 2017-05-03 Jeff Downs <heydowns@somuchpressure.net> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> |