git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* testsuite/ChangeLog: Remove merge marker. 

From-SVN: r239385
This commit is contained in:
Uros Bizjak 2016-08-11 21:07:43 +02:00
parent c73dd9864b
commit df83974966
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/testsuite/ChangeLog
View File

@ -1106,7 +1106,6 @@
* g++.dg/cpp0x/nullptr35.C (caught): Fix typo. * g++.dg/cpp0x/nullptr35.C (caught): Fix typo.
>>>>>>> .r238890
2016-07-15 Jerry DeLisle <jvdelisle@gcc.gnu.org> 2016-07-15 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Marco Restelli <mrestelli@gmail.com> Marco Restelli <mrestelli@gmail.com>