Commit 9e081bac by Mark Mitchell

Remove conflict marker

From-SVN: r124566
parent 357480ce
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment