std: merge conflict cleanup from std::str

This commit is contained in:
Jeff Olson
2013-09-16 23:39:33 -07:00
parent 95ef1f5415
commit c0ec40f74b

View File

@@ -22,7 +22,6 @@ use char;
use char::Char; use char::Char;
use clone::{Clone, DeepClone}; use clone::{Clone, DeepClone};
use container::{Container, Mutable}; use container::{Container, Mutable};
use num::Times;
use iter::{Iterator, FromIterator, Extendable, range}; use iter::{Iterator, FromIterator, Extendable, range};
use iter::{Filter, AdditiveIterator, Map}; use iter::{Filter, AdditiveIterator, Map};
use iter::{Invert, DoubleEndedIterator, ExactSize}; use iter::{Invert, DoubleEndedIterator, ExactSize};