Message ID | 20190523084617.GA20802@redhat.com |
---|---|
State | New |
Headers | show |
Series | Remove conflict marker from ChangeLog | expand |
commit 37084e7223802d5d38729f12fd3e1be3b86246fc Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu May 23 09:43:21 2019 +0100 Remove conflict marker from ChangeLog diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9f0f8893022..d3b4e32325c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1971,7 +1971,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