From 67fa2b7c2a26e909b1adb5fb188285367dfba7e4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 3 Oct 2016 23:35:23 +0200
Subject: Fix merge bugs

(bzr r15017.1.36)
---
 src/widgets/font-selector.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/widgets/font-selector.cpp')

diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index e9cf66621..f400de89c 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -19,10 +19,6 @@
 #include <config.h>
 #endif
 
-#include <2geom/transforms.h>
-
-#include <gtk/gtk.h>
-
 #include <libnrtype/font-lister.h>
 #include <libnrtype/font-instance.h>
 
@@ -33,7 +29,6 @@
 
 /* SPFontSelector */
 
-
 struct SPFontSelector
 {
     GtkBox hbox;
@@ -55,7 +50,6 @@ struct SPFontSelector
 };
 
 
-
 struct SPFontSelectorClass
 {
     GtkBoxClass parent_class;
@@ -251,7 +245,6 @@ static void sp_font_selector_dispose(GObject *object)
 
     if (fsel->fontspec) {
         delete fsel->fontspec;
-        fsel->fontspec = 0;
     }
 
     if (fsel->families.length > 0) {
-- 
cgit v1.2.3