From: Uros Bizjak <uros@gcc.gnu.org>
Date: Thu, 11 Aug 2016 19:07:43 +0000 (+0200)
Subject: * testsuite/ChangeLog: Remove merge marker.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df83974966e489c6f080dbd7f479fa12a1d671b2;p=gcc.git

* testsuite/ChangeLog: Remove merge marker.

From-SVN: r239385
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f33636aadd1..445d79937d6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -150,8 +150,8 @@
 
 2016-08-09  Martin Jambor  <mjambor@suse.cz>
 
-        PR ipa/71981
-        * gcc.dg/ipa/pr71981.c: New test.
+	PR ipa/71981
+	* gcc.dg/ipa/pr71981.c: New test.
 
 2016-08-09  Bin Cheng  <bin.cheng@arm.com>
 
@@ -1106,7 +1106,6 @@
 
 	* g++.dg/cpp0x/nullptr35.C (caught): Fix typo.
 
->>>>>>> .r238890
 2016-07-15  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 	    Marco Restelli <mrestelli@gmail.com>