resolve conflict from #1017

This commit is contained in:
Yukihiro Matz Matsumoto
2013-03-17 00:28:49 +09:00
15 changed files with 17 additions and 8 deletions
+4
View File
@@ -5,6 +5,10 @@
** against the current mruby implementation.
*/
#include <stdlib.h>
#include <string.h>
#include <mruby.h>
#include <mruby/proc.h>
#include <mruby/data.h>
+1
View File
@@ -1,3 +1,4 @@
#include <stdlib.h>
#include "mruby.h"
#include "mruby/irep.h"
#include "mruby/dump.h"