* cxx-pretty-print.c: Correct merge error.
commit5d127eeb298103e87782c6492700d328b04dcb49
authorJoseph Myers <joseph@codesourcery.com>
Fri, 21 May 2010 22:58:12 +0000 (21 23:58 +0100)
committerJoseph Myers <jsm28@gcc.gnu.org>
Fri, 21 May 2010 22:58:12 +0000 (21 23:58 +0100)
tree22edaa20ecfb1210767bafc20a6205015cf7f250
parentcf8358387d0a53c1a84e049c9998e89db814beab
* cxx-pretty-print.c: Correct merge error.

From-SVN: r159686
gcc/cp/ChangeLog
gcc/cp/cxx-pretty-print.c