Fixed conflicts after merge with master

2020-05-27 10:32:02 +02:00 · 2020-05-27 10:32:02 +02:00 · 2eb4b2caed
commit 2eb4b2caed
parent aa04f0e555 e6317cdefb
68 changed files with 467 additions and 1030 deletions
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@ -7,6 +7,7 @@
 #include "GCode/PrintExtents.hpp"
 #include "GCode/WipeTower.hpp"
 #include "ShortestPath.hpp"
+#include "Print.hpp"
 #include "Utils.hpp"
 #include "libslic3r.h"