resolve conflict

3a78093b · Yukihiro Matz Matsumoto · 5568df5e · 3a78093b
Commit 3a78093b authored Feb 18, 2013 by Yukihiro Matz Matsumoto
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/class.c src/class.c +1 -1

No files found.
--- 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;
 }