public_mirrors/OrcaSlicer-bambulab
1
0 Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-11-09 03:12:26 +00:00
Code Issues Activity

Fix of a preceding merge

Browse Source
This commit is contained in:
Vojtech Bubnik committed 2020-09-08 14:25:10 +02:00
1 parent ceaa61071a
commit 0a4debc98c
1 file changed
-3
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/Utils/Process.cpp
-3
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>