Fixed merge conflicts (whitespace only)

src/libslic3r/GCode.cpp

@@ -983,6 +983,7 @@ namespace DoExport {
 	    return volumetric_speed;
 	}
 
+
     static void init_ooze_prevention(const Print &print, OozePrevention &ooze_prevention)
 	{
 	    // Calculate wiping points if needed
@@ -2861,6 +2862,7 @@ std::string GCode::extrude_loop(ExtrusionLoop loop, std::string description, dou
             m_seam_position[m_layer->object()] = polygon.points[idx_min];
         }
 
+
         // Export the contour into a SVG file.
         #if 0
         {

src/libslic3r/GCode.hpp

@@ -69,6 +69,7 @@ private:
     std::unique_ptr<MotionPlanner> m_layer_mp;
 };
 
+
 class OozePrevention {
 public:
     bool enable;