diff options
| author | Daniel Bovensiepen <[email protected]> | 2012-11-08 17:36:39 +0900 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2012-11-08 17:36:39 +0900 |
| commit | fcaeec554a9aac77463f1460b469ea5f34a6f2a0 (patch) | |
| tree | 0de872f4e567036d8bddc53a99ee946365dbcb63 /test | |
| parent | e1e369470eb41453cb79abdbbbdb9158489e2d26 (diff) | |
| download | mruby-fcaeec554a9aac77463f1460b469ea5f34a6f2a0.tar.gz mruby-fcaeec554a9aac77463f1460b469ea5f34a6f2a0.zip | |
Fix merge
Diffstat (limited to 'test')
| -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 ############################## |