OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix failed merge

This commit is contained in:
Niko Matsakis 2011-10-31 14:43:21 -07:00 committed by Brian Anderson
parent ec77144713
commit 3f4fd29db8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/rt.mk
View File

@ -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