Remove conflict marker.

From-SVN: r83234
2004-06-16 10:45:58 +00:00 · 2004-06-16 10:45:58 +00:00 · 58b9accaeb
parent bf9a420e62
commit 58b9accaeb
1 changed files with 0 additions and 1 deletions
--- a/libstdc++-v3/ChangeLog
+++ b/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,