diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2022-02-01 16:16:13 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2022-02-01 16:16:13 +0300 |
| commit | 5c616c5931e61ea37c6be15f66297e4241824e33 (patch) | |
| tree | 225e9c469da05540220c5b066753feab8628632d /src/libslic3r/Platform.cpp | |
| parent | ebb9041041008cd759704c1507612d6172718ede (diff) | |
Sync to 2.4.1-beta1
Diffstat (limited to 'src/libslic3r/Platform.cpp')
| -rw-r--r-- | src/libslic3r/Platform.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/libslic3r/Platform.cpp b/src/libslic3r/Platform.cpp index 5408cf938..338752112 100644 --- a/src/libslic3r/Platform.cpp +++ b/src/libslic3r/Platform.cpp @@ -3,15 +3,12 @@ #include <boost/log/trivial.hpp> #include <boost/filesystem/operations.hpp> -<<<<<<< HEAD -======= #if defined(__APPLE__) #include <sys/types.h> #include <sys/sysctl.h> #include <mach/machine.h> #endif ->>>>>>> master namespace Slic3r { static auto s_platform = Platform::Uninitialized; @@ -25,10 +22,6 @@ void detect_platform() s_platform_flavor = PlatformFlavor::Generic; #elif defined(__APPLE__) BOOST_LOG_TRIVIAL(info) << "Platform: OSX"; -<<<<<<< HEAD - s_platform = Platform::OSX; - s_platform_flavor = PlatformFlavor::Generic; -======= s_platform = Platform::OSX; s_platform_flavor = PlatformFlavor::GenericOSX; { @@ -62,7 +55,6 @@ void detect_platform() } } } ->>>>>>> master #elif defined(__linux__) BOOST_LOG_TRIVIAL(info) << "Platform: Linux"; s_platform = Platform::Linux; @@ -113,8 +105,6 @@ PlatformFlavor platform_flavor() return s_platform_flavor; } -<<<<<<< HEAD -======= std::string platform_to_string(Platform platform) @@ -153,5 +143,4 @@ std::string platform_flavor_to_string(PlatformFlavor pf) } ->>>>>>> master } // namespace Slic3r |