From fcaeec554a9aac77463f1460b469ea5f34a6f2a0 Mon Sep 17 00:00:00 2001 From: Daniel Bovensiepen Date: Thu, 8 Nov 2012 17:36:39 +0900 Subject: Fix merge --- test/Makefile | 8 -------- 1 file changed, 8 deletions(-) (limited to 'test') 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 ############################## -- cgit v1.2.3