resolve conflict

src/init_ext.c

@@ -1,16 +0,0 @@
-/*
-** init_ext.c - initialize extend libraries
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include "mruby.h"
-
-void
-mrb_init_ext(mrb_state *mrb)
-{
-#ifdef INCLUDE_SOCKET
-  extern void mrb_init_socket(mrb_state *mrb);
-  mrb_init_socket(mrb);
-#endif
-}

src/state.c

@@ -11,7 +11,6 @@
 
 void mrb_init_heap(mrb_state*);
 void mrb_init_core(mrb_state*);
-void mrb_init_ext(mrb_state*);
 void mrb_final_core(mrb_state*);
 
 mrb_state*
@@ -28,7 +27,6 @@ mrb_open_allocf(mrb_allocf f, void *ud)
 
   mrb_init_heap(mrb);
   mrb_init_core(mrb);
-  mrb_init_ext(mrb);
   return mrb;
 }