Fix merge conflict.

octalmage · Oct 15, 2016 · d6d9e23 · d6d9e23
1 parent 4e0f44c
commit d6d9e23
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/robotjs.cc b/src/robotjs.cc
@@ -10,14 +10,9 @@
 #include "MMBitmap.h"
 #include "snprintf.h"
 #include "microsleep.h"
-<<<<<<< HEAD
-#include "io.h"
-#include "bmp_io.h"
-=======
 #if defined(USE_X11)
 	#include "xdisplay.h"
 #endif
->>>>>>> master
 
 using namespace v8;