remove conflict indicators
authorJason Merrill <jason@gcc.gnu.org>
Thu, 15 Apr 1999 05:55:59 +0000 (01:55 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Thu, 15 Apr 1999 05:55:59 +0000 (01:55 -0400)
commitfb8708d7b74bc42547e4bf31ed4f27f19add0efc
treeb8af04949e1b1f547526fafd1d1f33673f81893b
parentb607c87f1f37f933244bcdfa6ac83ef1a8ec6fda
remove conflict indicators

From-SVN: r26473
gcc/cp/ChangeLog