Remove svn conflict marker.

From-SVN: r243110

Remove svn conflict marker.
From-SVN: r243110
8e9c33cd · David Edelsohn · 825fba52 · 8e9c33cd
Commit 8e9c33cd authored Dec 01, 2016 by David Edelsohn
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
@@ -38,7 +38,6 @@
 	PR rtl-optimization/78607
 	* combine.c (try_combine): Emit a barrier after a unconditional trap.

->>>>>>> .r243107
 2016-11-30  Michael Meissner  <meissner@linux.vnet.ibm.com>

 	PR target/78602