diff options
| author | Uros Bizjak <uros@gcc.gnu.org> | 2016-08-11 21:07:43 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2016-08-11 21:07:43 +0200 |
| commit | df83974966e489c6f080dbd7f479fa12a1d671b2 (patch) | |
| tree | cfb350a7e44419140b409d9257101ddbc228616a | |
| parent | c73dd9864bb716800209f7fe5e86d95c4a3e9716 (diff) | |
| download | gcc-df83974966e489c6f080dbd7f479fa12a1d671b2.zip gcc-df83974966e489c6f080dbd7f479fa12a1d671b2.tar.gz gcc-df83974966e489c6f080dbd7f479fa12a1d671b2.tar.bz2 | |
* testsuite/ChangeLog: Remove merge marker.
From-SVN: r239385
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f33636a..445d799 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> |