eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-26 01:25:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solving merge conficts related to the html5ever_atoms -> html5ever change

Browse Source
This commit is contained in:
Christian Poveda
2017-05-03 12:57:49 -05:00
parent 875e422fe6 3905b5af18
commit 62821a6915
188 changed files with 1130 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/script/dom/htmlscriptelement.rs
View File

@@ -26,7 +26,7 @@ use dom::virtualmethods::VirtualMethods;
use dom_struct::dom_struct;
use encoding::label::encoding_from_whatwg_label;
use encoding::types::{DecoderTrap, EncodingRef};
use html5ever_atoms::{LocalName, Prefix};
use html5ever::{LocalName, Prefix};
use ipc_channel::ipc;
use ipc_channel::router::ROUTER;
use js::jsval::UndefinedValue;