From c0ec40f74bd33317fb0af76a68d29bfbaf211b58 Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Mon, 16 Sep 2013 23:39:33 -0700
Subject: [PATCH] std: merge conflict cleanup from std::str

---
 src/libstd/str.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libstd/str.rs b/src/libstd/str.rs
index 7cbc88ed204f..93cac8797bb7 100644
--- a/src/libstd/str.rs
+++ b/src/libstd/str.rs
@@ -22,7 +22,6 @@ use char;
 use char::Char;
 use clone::{Clone, DeepClone};
 use container::{Container, Mutable};
-use num::Times;
 use iter::{Iterator, FromIterator, Extendable, range};
 use iter::{Filter, AdditiveIterator, Map};
 use iter::{Invert, DoubleEndedIterator, ExactSize};