Fixed conflicts after merge with master

2020-05-27 10:32:02 +02:00
parent aa04f0e555 e6317cdefb
commit 2eb4b2caed
68 changed files with 467 additions and 1030 deletions
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -6,7 +6,6 @@
 #include "GUI_App.hpp"
 #include "GUI.hpp"
 #include "I18N.hpp"
-#include "AppConfig.hpp"
 #include "3DScene.hpp"
 #include "BackgroundSlicingProcess.hpp"
 #include "OpenGLManager.hpp"