OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict marker 

From-SVN: r124566
This commit is contained in:
Mark Mitchell 2007-05-09 05:31:15 +00:00
parent 357480cec5
commit 9e081bace4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libstdc++-v3/ChangeLog
View File

@ -102,7 +102,6 @@
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
>>>>>>> .r124554
2007-05-07 Mark Mitchell <mark@codesourcery.com>
* testsuite/lib/libstdc++.exp (v3_target_compile_as_c): For