Fixed conflicts after merge with master

2020-11-24 13:37:52 +01:00
parent 44fe3b8a00 1ce8cddbda
commit 9d71597e05
32 changed files with 6257 additions and 4486 deletions
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -79,6 +79,7 @@
 //===================
 #define ENABLE_2_3_0_BETA1 1

+#define ENABLE_SHOW_WIPE_MOVES (1 && ENABLE_GCODE_VIEWER && ENABLE_2_3_0_BETA1)
 #define ENABLE_DRAG_AND_DROP_FIX (1 && ENABLE_2_3_0_BETA1)

 #endif // _prusaslicer_technologies_h_