mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Solving merge conficts related to the html5ever_atoms -> html5ever change
This commit is contained in:
commit
62821a6915
188 changed files with 1130 additions and 697 deletions
|
@ -23,7 +23,7 @@ use dom::node::{Node, UnbindContext};
|
|||
use dom::text::Text;
|
||||
use dom::virtualmethods::VirtualMethods;
|
||||
use dom_struct::dom_struct;
|
||||
use html5ever_atoms::{LocalName, Prefix};
|
||||
use html5ever::{LocalName, Prefix};
|
||||
use std::cell::Cell;
|
||||
use style::element_state::*;
|
||||
use style::str::{split_html_space_chars, str_join};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue