resolve conflict

This commit is contained in:
Yukihiro Matz Matsumoto
2013-02-18 09:13:52 +09:00
parent 5568df5efe
commit 3a78093b45
+1 -1
View File
@@ -1737,7 +1737,7 @@ mrb_mod_remove_const(mrb_state *mrb, mrb_value mod)
check_const_name(mrb, id);
val = mrb_iv_remove(mrb, mod, id);
if (mrb_undef_p(val)) {
mrb_name_error(mrb, sym, "constant %s not defined", mrb_sym2name(mrb, sym));
mrb_name_error(mrb, id, "constant %s not defined", mrb_sym2name(mrb, id));
}
return val;
}