diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-05 20:43:04 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-10-05 20:43:04 +0000 |
| commit | 51aff00b07c0058a85adc41688a021b155154dcc (patch) | |
| tree | 7d01a631ce0ce1c4455f4ba815481018f5878ece /libstdc++-v3 | |
| parent | dd6b3fc939da6bb4ba17fa86d2a45bf0585dc493 (diff) | |
| download | gcc-51aff00b07c0058a85adc41688a021b155154dcc.tar.gz | |
2010-10-05 Jonathan Wakely <jwakely.gcc@gmail.com>
* Remove svn conflict marker in ChangeLog.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165001 138bc75d-0d04-0410-961f-82ee72b054a4
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 c38d7499d47..b6c4acab765 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 |