From 3a78093b45c176baae7b13d47ed08e135aad1123 Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Mon, 18 Feb 2013 09:13:52 +0900 Subject: resolve conflict --- src/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/class.c b/src/class.c index 7d99da56a..e70bd7e73 100644 --- a/src/class.c +++ b/src/class.c @@ -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; } -- cgit v1.2.3