Remove conflict marker.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83234 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6c14abba3d27c98251f490a7dd0cc903d327a03e..a6ad3faa1f2a976682339e0aaf461522c45de629 100644 (file)
--- 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,