juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 03:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix of a preceding merge

Browse Source
This commit is contained in:
Vojtech Bubnik
2020-09-08 14:25:10 +02:00
parent ceaa61071a
commit 0a4debc98c
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/Utils/Process.cpp
View File

@@ -18,10 +18,7 @@
// Fails to compile on Windows on the build server. // Fails to compile on Windows on the build server.
#ifdef __APPLE__ #ifdef __APPLE__
#include <boost/process/spawn.hpp> #include <boost/process/spawn.hpp>
<<<<<<< HEAD
=======
#include <boost/process/args.hpp> #include <boost/process/args.hpp>
>>>>>>> vb_gcodeviewer_menu
#endif #endif
#include <wx/stdpaths.h> #include <wx/stdpaths.h>