diff options
| author | Vojtech Bubnik <bubnikv@gmail.com> | 2020-09-08 15:25:10 +0300 |
|---|---|---|
| committer | Vojtech Bubnik <bubnikv@gmail.com> | 2020-09-08 15:25:10 +0300 |
| commit | 0a4debc98c0499a2aa8cfa1940bc042c482fa323 (patch) | |
| tree | 8a9306f4e35c6f6b9fc206ad1e58ec4af45242dc /src/slic3r | |
| parent | ceaa61071a1b5315caa6b9b1677b7c13f50d6aea (diff) | |
Fix of a preceding merge
Diffstat (limited to 'src/slic3r')
| -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> |