From f40daab2d1d329c66e37917baf308f1c249de028 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Thu, 8 Sep 2011 03:34:13 +0200
Subject: fixed merge conflict


diff --git a/src/export.cc b/src/export.cc
index 3b8b102..6c427dd 100644
--- a/src/export.cc
+++ b/src/export.cc
@@ -32,7 +32,6 @@
 #include <QApplication>
 #include <QProgressDialog>
 #include <errno.h>
-#include <fstream>
 
 #ifdef ENABLE_CGAL
 #include "CGAL_Nef_polyhedron.h"
-- 
cgit v0.10.1