diff options
| -rw-r--r-- | test/Makefile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/test/Makefile b/test/Makefile index b06343084..a4d8b7c0b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -51,13 +51,6 @@ endif # mruby compiler and test driver ifeq ($(OS),Windows_NT) -<<<<<<< HEAD - MRBC = ../bin/mrbc.exe - EXE := $(TARGET).exe -else - MRBC = ../bin/mrbc - EXE := $(TARGET) -======= MRBC = ../bin/mrbc.exe MRUBY= ../bin/mruby.exe EXE := $(TARGET).exe @@ -65,7 +58,6 @@ else MRBC = ../bin/mrbc MRUBY= ../bin/mruby EXE := $(TARGET) ->>>>>>> upstream/master endif ############################## |