fix failed merge
This commit is contained in:
parent
ec77144713
commit
3f4fd29db8
4
mk/rt.mk
4
mk/rt.mk
|
@ -76,11 +76,7 @@ RUNTIME_HDR := rt/globals.h \
|
|||
rt/test/rust_test_harness.h \
|
||||
rt/test/rust_test_runtime.h \
|
||||
rt/test/rust_test_util.h \
|
||||
<<<<<<< HEAD
|
||||
rt/arch/i386/context.h
|
||||
=======
|
||||
rt/arch/i386/context.h
|
||||
>>>>>>> start going back to an i386 build
|
||||
|
||||
ifeq ($(CFG_WINDOWSY), 1)
|
||||
LIBUV_OSTYPE := win
|
||||
|
|
Loading…
Reference in New Issue