diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-31 15:32:38 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-31 15:32:38 +0900 |
| commit | 64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9 (patch) | |
| tree | 00bca09773b7584fd2b56c371fe6159550c38b6f /src/init.c | |
| parent | 0d8adaaaa16859342a37e3bf6832a8717c54f27c (diff) | |
| download | mruby-64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9.tar.gz mruby-64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9.zip | |
resolve conflict
Diffstat (limited to 'src/init.c')
| -rw-r--r-- | src/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/init.c b/src/init.c index 5aab8d6ae..17ce24313 100644 --- a/src/init.c +++ b/src/init.c @@ -20,7 +20,6 @@ void mrb_init_proc(mrb_state*); void mrb_init_range(mrb_state*); void mrb_init_string(mrb_state*); void mrb_init_regexp(mrb_state*); -void mrb_init_encoding(mrb_state*); void mrb_init_exception(mrb_state*); void mrb_init_time(mrb_state*); void mrb_init_io(mrb_state*); @@ -54,7 +53,6 @@ mrb_init_core(mrb_state *mrb) mrb_init_gc(mrb); #ifdef INCLUDE_REGEXP mrb_init_regexp(mrb); - mrb_init_encoding(mrb); #endif mrb_init_exception(mrb); mrb_init_print(mrb); |