From 1f1ab75d754dc5f26dbf103eb6461db950895788 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Thu, 31 May 2012 15:33:20 +0900 Subject: resolve conflict --- src/string.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/string.c') diff --git a/src/string.c b/src/string.c index 257286144..3677da0ab 100644 --- 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; } -- cgit v1.2.3