make test-tidy happy + fix some merge errors

This commit is contained in:
rohan.prinja 2015-11-03 19:11:01 +09:00
parent 6e774ea6eb
commit 425c0b85d9
7 changed files with 7 additions and 9 deletions

View file

@ -10,8 +10,8 @@ use dom::bindings::codegen::UnionTypes::USVStringOrURLSearchParams::{eUSVString,
use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::Root;
use dom::bindings::str::USVString;
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::str::USVString;
use encoding::types::EncodingRef;
use url::form_urlencoded::{parse, serialize_with_encoding};
use util::str::DOMString;