diff options
| author | Jonathan Wakely <redi@gcc.gnu.org> | 2019-05-23 09:46:45 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-05-23 09:46:45 +0100 |
| commit | b636effb6c27c0aec694ba68f115b58f2544844d (patch) | |
| tree | 5f0df761f4c8790213b7310a518d064e4d4385d1 | |
| parent | cf9847d25f1ca8998725ce1807e8bca23b11832e (diff) | |
| download | gcc-b636effb6c27c0aec694ba68f115b58f2544844d.zip gcc-b636effb6c27c0aec694ba68f115b58f2544844d.tar.gz gcc-b636effb6c27c0aec694ba68f115b58f2544844d.tar.bz2 | |
Remove conflict marker from ChangeLog
From-SVN: r271542
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 26683b8..45294c2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1975,7 +1975,6 @@ Fix test-suite. and macros. * config/i386/t-i386: Define dependencies for new files. ->>>>>>> .r270937 2019-05-03 Richard Earnshaw <rearnsha@arm.com> PR target/89400 |