From 30425bfe54318049e07d97602742b7ee6c745b3a Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 14 Apr 2015 12:18:37 -0700
Subject: Test fixes and rebase conflicts

---
 src/libstd/path.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd')

diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index 4247dc1b6d8..b7160df6c92 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -1570,7 +1570,7 @@ impl Path {
     /// # Examples
     ///
     /// ```
-    /// use std::path::Path;
+    /// use std::path::{Path, PathBuf};
     ///
     /// let path = Path::new("/tmp/foo.rs");
     ///
-- 
cgit 1.4.1-3-g733a5