diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 15:59:24 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 15:59:24 +0000 |
| commit | 3edf43c4cfe9df91ba30888fb631eec036595f88 (patch) | |
| tree | fd9715eac15f26bd9b10dc7ed3949ffd48d3817c | |
| parent | 389278af977066c5c8b077432920db6df89fcd6a (diff) | |
ChangeLog: conflict mark removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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. |