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

@ -4,7 +4,7 @@
use dom::bindings::codegen::Bindings::HTMLOutputElementBinding;
use dom::bindings::codegen::Bindings::HTMLOutputElementBinding::HTMLOutputElementMethods;
use dom::bindings::conversions::Castable;
use dom::bindings::inheritance::Castable;
use dom::bindings::js::Root;
use dom::document::Document;
use dom::htmlelement::HTMLElement;