Skip to content

R
riscv-gcc-1
Commit 58b9acca by Andreas Schwab
Options

Remove conflict marker. 

From-SVN: r83234
parent bf9a420e
Showing with 0 additions and 1 deletions
libstdc++-v3/ChangeLog
......@@ -41,7 +41,6 @@
decrease __nmatches and increase __i3 at once, only either of
the two; tidy.
>>>>>>> 1.2516
2004-06-13 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (time_get<>::do_get_time,
......
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