Remove conflict marker from ChangeLog

From-SVN: r271542

Remove conflict marker from ChangeLog
From-SVN: r271542
b636effb · Jonathan Wakely · cf9847d2 · b636effb
Commit b636effb authored May 23, 2019 by Jonathan Wakely
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- 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