aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmldetailselement.rs
diff options
context:
space:
mode:
authorChristian Poveda <z1mvader@protonmail.com>2017-05-03 12:57:49 -0500
committerChristian Poveda <z1mvader@protonmail.com>2017-05-03 12:57:49 -0500
commit62821a69153441f36b8ff10050a29502dea71037 (patch)
treebb1560f8965520a1bded497d81c18f1dabfe57e8 /components/script/dom/htmldetailselement.rs
parent875e422fe67f68bdf57bd3635279e224b0c90996 (diff)
parent3905b5af1804ad912c6e1854a0bcdfe9bda79065 (diff)
downloadservo-62821a69153441f36b8ff10050a29502dea71037.tar.gz
servo-62821a69153441f36b8ff10050a29502dea71037.zip
Solving merge conficts related to the html5ever_atoms -> html5ever change
Diffstat (limited to 'components/script/dom/htmldetailselement.rs')
-rw-r--r--components/script/dom/htmldetailselement.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/htmldetailselement.rs b/components/script/dom/htmldetailselement.rs
index 9f0010b683f..6c44ad48fa9 100644
--- a/components/script/dom/htmldetailselement.rs
+++ b/components/script/dom/htmldetailselement.rs
@@ -15,7 +15,7 @@ use dom::htmlelement::HTMLElement;
use dom::node::{Node, window_from_node};
use dom::virtualmethods::VirtualMethods;
use dom_struct::dom_struct;
-use html5ever_atoms::{LocalName, Prefix};
+use html5ever::{LocalName, Prefix};
use script_thread::Runnable;
use std::cell::Cell;
use task_source::TaskSource;