resolve conflict

This commit is contained in:
Yukihiro Matsumoto
2012-05-31 15:33:20 +09:00
parent 64fc4ac332
commit 1f1ab75d75
-1
View File
@@ -635,7 +635,6 @@ mrb_str_index(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int offset)
slen = RSTRING_LEN(sub);
len = RSTRING_LEN(str) - offset;
pos = mrb_memsearch(sptr, slen, s, len);
if (pos < 0) return pos;
return pos + offset;
}