From 0a4debc98c0499a2aa8cfa1940bc042c482fa323 Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Tue, 8 Sep 2020 14:25:10 +0200
Subject: [PATCH] Fix of a preceding merge

---
 src/slic3r/Utils/Process.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/slic3r/Utils/Process.cpp b/src/slic3r/Utils/Process.cpp
index b81a74827..561971b13 100644
--- a/src/slic3r/Utils/Process.cpp
+++ b/src/slic3r/Utils/Process.cpp
@@ -18,10 +18,7 @@
 // Fails to compile on Windows on the build server.
 #ifdef __APPLE__
     #include <boost/process/spawn.hpp>
-<<<<<<< HEAD
-=======
     #include <boost/process/args.hpp>
->>>>>>> vb_gcodeviewer_menu
 #endif
 
 #include <wx/stdpaths.h>