---

nikomatsakis · brson · commit 1837e193a713 · 2011-11-02T14:14:20.000-07:00
yaml --- r: 6115 b: refs/heads/master c: 3f4fd29 h: refs/heads/master i: 6113: 41fe152 6111: 37cf4a2 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec77144713a67ae8aa616cecd054786cf9e5aa44
+refs/heads/master: 3f4fd29db85c1f13518bc60ec84b8d231283cf13
diff --git a/trunk/mk/rt.mk b/trunk/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

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: ec77144713a67ae8aa616cecd054786cf9e5aa44`
	`2`	`+refs/heads/master: 3f4fd29db85c1f13518bc60ec84b8d231283cf13`