diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-15 10:55:46 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-15 10:55:46 +0900 |
| commit | 5138f62d6ba666dc0cb43618f407701b0414040e (patch) | |
| tree | 6847b42135cba62a7ef7f4e359647122d1be173a /src/proc.c | |
| parent | 6e0c48d7584d27883d8fb7e5c6fe8eb6f1db0a91 (diff) | |
| parent | f3f99fa2cde9b05fde3fa5e4317ed7dc5e81aea8 (diff) | |
| download | mruby-5138f62d6ba666dc0cb43618f407701b0414040e.tar.gz mruby-5138f62d6ba666dc0cb43618f407701b0414040e.zip | |
resolve conflict
Diffstat (limited to 'src/proc.c')
| -rw-r--r-- | src/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/proc.c b/src/proc.c index 0dfc3f818..fa4c28fc8 100644 --- a/src/proc.c +++ b/src/proc.c @@ -201,7 +201,7 @@ mrb_init_proc(mrb_state *mrb) call_irep->iseq = call_iseq; call_irep->ilen = 1; - mrb->proc_class = mrb_define_class(mrb, "Proc", mrb->object_class); + mrb->proc_class = mrb_define_class(mrb, "Proc", mrb->object_class); /* 15.2.17 */ MRB_SET_INSTANCE_TT(mrb->proc_class, MRB_TT_PROC); mrb_define_method(mrb, mrb->proc_class, "initialize", mrb_proc_initialize, MRB_ARGS_NONE()); |