projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c73dd98)
* testsuite/ChangeLog: Remove merge marker.
authorUros Bizjak <uros@gcc.gnu.org>
Thu, 11 Aug 2016 19:07:43 +0000 (21:07 +0200)
committerUros Bizjak <uros@gcc.gnu.org>
Thu, 11 Aug 2016 19:07:43 +0000 (21:07 +0200)
From-SVN: r239385

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f33636aadd11aa6bee725e1416a6b64edabb827e..445d79937d6518029762523867bb4966ebdb45ff 100644 (file)
--- 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>