mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +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
|
@ -27,7 +27,7 @@ use dom::virtualmethods::VirtualMethods;
|
|||
use dom::webglrenderingcontext::{LayoutCanvasWebGLRenderingContextHelpers, WebGLRenderingContext};
|
||||
use dom_struct::dom_struct;
|
||||
use euclid::size::Size2D;
|
||||
use html5ever_atoms::{LocalName, Prefix};
|
||||
use html5ever::{LocalName, Prefix};
|
||||
use image::ColorType;
|
||||
use image::png::PNGEncoder;
|
||||
use ipc_channel::ipc::{self, IpcSender};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue