projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 825fba5)
Remove svn conflict marker.
authorDavid Edelsohn <dje@gcc.gnu.org>
Thu, 1 Dec 2016 13:48:22 +0000 (08:48 -0500)
committerDavid Edelsohn <dje@gcc.gnu.org>
Thu, 1 Dec 2016 13:48:22 +0000 (08:48 -0500)
From-SVN: r243110

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a164a01cadf5eafae6a62597033c42cac89679c9..4d15a7308dbc8adfaaabaaf5e48201d67f2b0a37 100644 (file)
--- 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