diff options
| author | Christian Poveda <z1mvader@protonmail.com> | 2017-05-03 12:57:49 -0500 |
|---|---|---|
| committer | Christian Poveda <z1mvader@protonmail.com> | 2017-05-03 12:57:49 -0500 |
| commit | 62821a69153441f36b8ff10050a29502dea71037 (patch) | |
| tree | bb1560f8965520a1bded497d81c18f1dabfe57e8 /components/script/dom/htmliframeelement.rs | |
| parent | 875e422fe67f68bdf57bd3635279e224b0c90996 (diff) | |
| parent | 3905b5af1804ad912c6e1854a0bcdfe9bda79065 (diff) | |
| download | servo-62821a69153441f36b8ff10050a29502dea71037.tar.gz servo-62821a69153441f36b8ff10050a29502dea71037.zip | |
Solving merge conficts related to the html5ever_atoms -> html5ever change
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 3f410bdce54..e1a7fb7c672 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -36,7 +36,7 @@ use dom::node::{Node, NodeDamage, UnbindContext, document_from_node, window_from use dom::virtualmethods::VirtualMethods; use dom::window::{ReflowReason, Window}; use dom_struct::dom_struct; -use html5ever_atoms::{LocalName, Prefix}; +use html5ever::{LocalName, Prefix}; use ipc_channel::ipc; use js::jsapi::{JSAutoCompartment, JSContext, MutableHandleValue}; use js::jsval::{NullValue, UndefinedValue}; |