Fixed merge conflicts (whitespace only)

2020-09-01 18:33:56 +02:00 · 2020-09-01 18:33:56 +02:00 · 60cf002e94
commit 60cf002e94
parent 46eb96e84f
2 changed files with 297 additions and 294 deletions
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@ -69,6 +69,7 @@ private:
    std::unique_ptr<MotionPlanner> m_layer_mp;
 };

+
 class OozePrevention {
 public:
    bool enable;