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/hash.c | |
| parent | 6e0c48d7584d27883d8fb7e5c6fe8eb6f1db0a91 (diff) | |
| parent | f3f99fa2cde9b05fde3fa5e4317ed7dc5e81aea8 (diff) | |
| download | mruby-5138f62d6ba666dc0cb43618f407701b0414040e.tar.gz mruby-5138f62d6ba666dc0cb43618f407701b0414040e.zip | |
resolve conflict
Diffstat (limited to 'src/hash.c')
| -rw-r--r-- | src/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hash.c b/src/hash.c index 985d5259a..c39560d5c 100644 --- a/src/hash.c +++ b/src/hash.c @@ -826,7 +826,7 @@ mrb_init_hash(mrb_state *mrb) { struct RClass *h; - h = mrb->hash_class = mrb_define_class(mrb, "Hash", mrb->object_class); + h = mrb->hash_class = mrb_define_class(mrb, "Hash", mrb->object_class); /* 15.2.13 */ MRB_SET_INSTANCE_TT(h, MRB_TT_HASH); mrb_define_method(mrb, h, "[]", mrb_hash_aget, MRB_ARGS_REQ(1)); /* 15.2.13.4.2 */ |