ruby-cvs:21672
From: matz ruby-lang.org
Date: Sat, 22 Dec 2007 00:59:25 +0900 (JST)
Subject: [ruby-cvs:21672] Ruby:r14435 (trunk): ChangeLog: conflict mark removed.
matz 2007-12-22 00:59:24 +0900 (Sat, 22 Dec 2007)
New Revision: 14435
Modified files:
trunk/ChangeLog
Log:
ChangeLog: conflict mark removed.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14435&r2=14434