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/symbol.c | |
| parent | 6e0c48d7584d27883d8fb7e5c6fe8eb6f1db0a91 (diff) | |
| parent | f3f99fa2cde9b05fde3fa5e4317ed7dc5e81aea8 (diff) | |
| download | mruby-5138f62d6ba666dc0cb43618f407701b0414040e.tar.gz mruby-5138f62d6ba666dc0cb43618f407701b0414040e.zip | |
resolve conflict
Diffstat (limited to 'src/symbol.c')
| -rw-r--r-- | src/symbol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/symbol.c b/src/symbol.c index 170dc2cf2..fd0b116bd 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -473,7 +473,7 @@ mrb_init_symbol(mrb_state *mrb) { struct RClass *sym; - sym = mrb->symbol_class = mrb_define_class(mrb, "Symbol", mrb->object_class); + sym = mrb->symbol_class = mrb_define_class(mrb, "Symbol", mrb->object_class); /* 15.2.11 */ mrb_define_method(mrb, sym, "===", sym_equal, MRB_ARGS_REQ(1)); /* 15.2.11.3.1 */ mrb_define_method(mrb, sym, "id2name", mrb_sym_to_s, MRB_ARGS_NONE()); /* 15.2.11.3.2 */ |