diff options
| author | Jonathan Wakely <redi@gcc.gnu.org> | 2010-10-05 21:43:04 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2010-10-05 21:43:04 +0100 |
| commit | c6f3b5880ebe6b5359703cb43acb1cec6273f62d (patch) | |
| tree | 7d01a631ce0ce1c4455f4ba815481018f5878ece /libstdc++-v3 | |
| parent | c1f9afd1d3fbf5030bc6f8ff1bdc81ebf6c9bc20 (diff) | |
| download | gcc-c6f3b5880ebe6b5359703cb43acb1cec6273f62d.zip gcc-c6f3b5880ebe6b5359703cb43acb1cec6273f62d.tar.gz gcc-c6f3b5880ebe6b5359703cb43acb1cec6273f62d.tar.bz2 | |
2010-10-05 Jonathan Wakely <jwakely.gcc@gmail.com>
* Remove svn conflict marker in ChangeLog.
From-SVN: r165001
Diffstat (limited to 'libstdc++-v3')
| -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 c38d749..b6c4aca 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -145,7 +145,6 @@ * configure: Regenerate. * include/Makefile.in: Likewise. ->>>>>>> .r164755 2010-09-22 David Krauss <potswa@mac.com> PR libstdc++/45628 |