diff options
| -rw-r--r-- | src/slic3r/Utils/Process.cpp | 3 |
1 files changed, 0 insertions, 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> |