Fixed conflits after merge with master

2020-12-04 12:33:44 +01:00
parent 26982b16c7 0688778a24
commit 7a54c4fdfe
20 changed files with 556 additions and 160 deletions
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -89,6 +89,7 @@
 #define ENABLE_2_3_0_BETA2 1

 #define ENABLE_ARROW_KEYS_WITH_SLIDERS (1 && ENABLE_2_3_0_BETA2)
+#define ENABLE_NEW_NOTIFICATIONS_FADE_OUT (1 && ENABLE_2_3_0_BETA2) 
 #define ENABLE_PREVIEW_TYPE_CHANGE (1 && ENABLE_2_3_0_BETA2)