procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove conflict marker.

Browse source 
From-SVN: r83234
This commit is contained in:
Andreas Schwab 2004-06-16 10:45:58 +00:00
parent bf9a420e62
commit 58b9accaeb
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

@ -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,