From 192e514acaadf13e718105ab1d4e307f341a0e78 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sun, 31 Oct 2010 12:52:26 +0100
Subject: fixed minor merge mistake


diff --git a/src/polyset.cc b/src/polyset.cc
index 396f759..5bfabaa 100644
--- a/src/polyset.cc
+++ b/src/polyset.cc
@@ -25,7 +25,8 @@
 
 #include "polyset.h"
 #include "printutils.h"
-#include "Preferences.h"
+// FIXME: Reenable/rewrite - don't be dependant on GUI
+// #include "Preferences.h"
 #ifdef ENABLE_CGAL
 #include <CGAL/assertions_behaviour.h>
 #include <CGAL/exceptions.h>
-- 
cgit v0.10.1