projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf9847d)
Remove conflict marker from ChangeLog
authorJonathan Wakely <redi@gcc.gnu.org>
Thu, 23 May 2019 08:46:45 +0000 (09:46 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Thu, 23 May 2019 08:46:45 +0000 (09:46 +0100)
From-SVN: r271542

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 26683b82eeab8da55d444863ec17d3b2805fb41b..45294c250473c08ab57bff4959344d861423cb2d 100644 (file)
--- 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