Fixed conflicts after merge with master

2019-11-07 09:55:44 +01:00
parent 3f1674f91d 3141fe5e73
commit 35fd632316
117 changed files with 6769 additions and 1131 deletions
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@ -146,6 +146,8 @@ set(SLIC3R_GUI_SOURCES
    Utils/OctoPrint.hpp
    Utils/Duet.cpp
    Utils/Duet.hpp
+    Utils/FlashAir.cpp
+    Utils/FlashAir.hpp
    Utils/PrintHost.cpp
    Utils/PrintHost.hpp
    Utils/Bonjour.cpp