removed old conflict marker
authorTom Tromey <tromey@gcc.gnu.org>
Mon, 18 Sep 2006 17:10:36 +0000 (17:10 +0000)
committerTom Tromey <tromey@gcc.gnu.org>
Mon, 18 Sep 2006 17:10:36 +0000 (17:10 +0000)
commit97211077049068d8ff43e5e55627cf429ee0e869
treee36f0cb17307e5a93e1cbf4e262b2fe276e59079
parentfad257c3163ed5afdb38236a756d66c80539a9a1
removed old conflict marker

From-SVN: r117030
libjava/ChangeLog