Fixed conflicts after merge with master

2020-04-02 12:29:30 +02:00
parent 956f7a4593 b578b7ec87
commit ab1e90ec0d
33 changed files with 688 additions and 544 deletions
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -64,6 +64,7 @@ add_library(libslic3r STATIC
    Fill/FillRectilinear3.hpp
    Flow.cpp
    Flow.hpp
+    format.hpp
    Format/3mf.cpp
    Format/3mf.hpp
    Format/AMF.cpp