1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ChangeLog: conflict mark removed.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-21 15:59:24 +00:00
parent 389278af97
commit 3edf43c4cf
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -249,7 +249,6 @@ Fri Dec 21 12:45:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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@ruby-lang.org>
* file.c (Init_File): File.exists? revived.