diff options
| author | David Kocik <kocikdav@gmail.com> | 2019-11-27 16:30:10 +0300 |
|---|---|---|
| committer | David Kocik <kocikdav@gmail.com> | 2019-12-13 17:12:20 +0300 |
| commit | 9c79c7f644d0e2155cb7bd1c50bcc4b7b6e03d47 (patch) | |
| tree | 64e4c45a57018197760807f9d97ea71b84e7d31b /src/slic3r/GUI/AppConfig.cpp | |
| parent | 1ec7fc23e24b7d981b513d52a039201f2cac506f (diff) | |
prev commit linux part
Diffstat (limited to 'src/slic3r/GUI/AppConfig.cpp')
| -rw-r--r-- | src/slic3r/GUI/AppConfig.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp index e27fa1be6..d33d945ef 100644 --- a/src/slic3r/GUI/AppConfig.cpp +++ b/src/slic3r/GUI/AppConfig.cpp @@ -357,18 +357,6 @@ void AppConfig::update_skein_dir(const std::string &dir) std::string AppConfig::get_last_output_dir(const std::string &alt) const { -<<<<<<< HEAD -<<<<<<< HEAD - -======= - if (GUI::RemovableDriveManager::getInstance().update()) - { - return GUI::RemovableDriveManager::getInstance().get_last_drive_path(); - } ->>>>>>> removable drive manager - Windows part -======= - ->>>>>>> check if last path is on rem drive const auto it = m_storage.find(""); if (it != m_storage.end()) { const auto it2 = it->second.find("last_output_path"); |