From 6ac3799b75780f8c18bc38331403e1e517b89bab Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 17 Feb 2015 15:24:34 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/sys/windows/thread.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libstd/sys/windows')

diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
index d7f86e1842e..f3a27877e5c 100644
--- a/src/libstd/sys/windows/thread.rs
+++ b/src/libstd/sys/windows/thread.rs
@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use boxed::Box;
+use prelude::v1::*;
+
 use cmp;
 use io;
 use mem;
-- 
cgit 1.4.1-3-g733a5