diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-08 01:34:13 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-08 01:34:13 (GMT) |
| commit | f40daab2d1d329c66e37917baf308f1c249de028 (patch) | |
| tree | 29624818a36099f867407b5701461ec998b6ce57 /src | |
| parent | a8d88c57fd960d56f5952ecf49903e91a9634ae0 (diff) | |
fixed merge conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/export.cc | 1 |
1 files changed, 0 insertions, 1 deletions
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" |