From 64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9 Mon Sep 17 00:00:00 2001
From: Yukihiro Matsumoto <matz@ruby-lang.org>
Date: Thu, 31 May 2012 15:32:38 +0900
Subject: resolve conflict

---
 src/init.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/init.c')

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);
-- 
cgit v1.2.3