2010-10-05 Jonathan Wakely <jwakely.gcc@gmail.com>
* Remove svn conflict marker in ChangeLog. From-SVN: r165001
This commit is contained in:
parent
c1f9afd1d3
commit
c6f3b5880e
1 changed files with 0 additions and 1 deletions
|
@ -145,7 +145,6 @@
|
|||
* configure: Regenerate.
|
||||
* include/Makefile.in: Likewise.
|
||||
|
||||
>>>>>>> .r164755
|
||||
2010-09-22 David Krauss <potswa@mac.com>
|
||||
|
||||
PR libstdc++/45628
|
||||
|
|
Loading…
Add table
Reference in a new issue