aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a164a01..4d15a73 100644
--- 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