Fix merge errors from the refactor-gfx merge.

servo · brson · Apr 18, 2013 · Apr 18, 2013 · Apr 18, 2013 · 076a43b71b463858529a2354acd651b16f6d50db
commit 076a43b71b463858529a2354acd651b16f6d50db
diff --git a/src/servo-gfx/platform/linux/font.rs b/src/servo-gfx/platform/linux/font.rs
@@ -4,7 +4,6 @@
 
 extern mod freetype;
 
-use freetype_impl::font_context::FreeTypeFontContextHandle;
 use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FractionalPixel, SpecifiedFontStyle, UsedFontStyle, FontWeight100};
 use font::{FontWeight200, FontWeight300, FontWeight400, FontWeight500, FontWeight600};

diff --git a/src/servo-gfx/platform/linux/font_list.rs b/src/servo-gfx/platform/linux/font_list.rs
@@ -5,8 +5,6 @@
 extern mod freetype;
 extern mod fontconfig;
 
-use freetype_impl::font_context::FreeTypeFontContextHandle;
-use freetype_impl::font::FreeTypeFontHandle;
 use self::fontconfig::fontconfig::{FcChar8, FcResultMatch, FcSetSystem,
                                    FcResultNoMatch, FcMatchPattern};
 use self::fontconfig::fontconfig::bindgen::{