diff options
| author | Andreas Schwab <schwab@gcc.gnu.org> | 2004-06-16 10:45:58 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2004-06-16 10:45:58 +0000 |
| commit | 58b9accaebab8fc4ee05a52f6698c24e8bfa65e2 (patch) | |
| tree | c5c381c1780c7f554d92b4a9a7f6bcae8264b5c8 | |
| parent | bf9a420e62f4f6993daa8b581a6d4ec28ace4730 (diff) | |
| download | gcc-58b9accaebab8fc4ee05a52f6698c24e8bfa65e2.zip gcc-58b9accaebab8fc4ee05a52f6698c24e8bfa65e2.tar.gz gcc-58b9accaebab8fc4ee05a52f6698c24e8bfa65e2.tar.bz2 | |
Remove conflict marker.
From-SVN: r83234
| -rw-r--r-- | libstdc++-v3/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6c14abb..a6ad3fa 100644 --- 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, |