resolve conflict

1f1ab75d · Yukihiro Matsumoto · 64fc4ac3 · 1f1ab75d
Commit 1f1ab75d authored May 31, 2012 by Yukihiro Matsumoto
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

src/string.c src/string.c +0 -1

No files found.
--- a/src/string.c
+++ b/src/string.c
@@ -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;
 }