ruby-changes:2944
From: ko1@a...
Date: 22 Dec 2007 00:59:39 +0900
Subject: [ruby-changes:2944] matz - 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 Index: ChangeLog =================================================================== --- ChangeLog (revision 14434) +++ ChangeLog (revision 14435) @@ -249,7 +249,6 @@ * string.c (rb_str_chomp_bang): avoid unnecessary loop using ONIGENC_LEFT_ADJUST_CHAR_HEAD(). ->>>>>>> .r14423 Fri Dec 21 12:32:08 2007 Yukihiro Matsumoto <matz@r...> * file.c (Init_File): File.exists? revived. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml