Fixed conflicts after merge with master

This commit is contained in:
enricoturri1966 committed 2020-05-27 10:32:02 +02:00
commit 2eb4b2caed
68 files changed
+467 -1030

No files matched your search

+1
View File
@@ -2,6 +2,7 @@
#include "libslic3r/libslic3r.h"
#include "libslic3r/Print.hpp"
#include "libslic3r/Layer.hpp"
#include "test_data.hpp"
+1
View File
@@ -2,6 +2,7 @@
#include "libslic3r/libslic3r.h"
#include "libslic3r/Print.hpp"
#include "libslic3r/Layer.hpp"
#include "test_data.hpp"
@@ -1,6 +1,7 @@
#include <catch2/catch.hpp>
#include "libslic3r/GCodeReader.hpp"
#include "libslic3r/Layer.hpp"
#include "test_data.hpp" // get access to init_print, etc