diff options
Diffstat (limited to 'src/slic3r/GUI/GUI_App.hpp')
| -rw-r--r-- | src/slic3r/GUI/GUI_App.hpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 0dc2c1864..0dcf65512 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -66,11 +66,6 @@ enum FileType FT_TEX, FT_SL1, -<<<<<<< HEAD - // Workaround for OSX file picker, for some reason it always saves with the 1st extension. - FT_SL1S, -======= ->>>>>>> master FT_SIZE, }; @@ -264,7 +259,6 @@ public: bool check_print_host_queue(); bool checked_tab(Tab* tab); void load_current_presets(bool check_printer_presets = true); - void update_wizard_from_config(); wxString current_language_code() const { return m_wxLocale->GetCanonicalName(); } // Translate the language code to a code, for which Prusa Research maintains translations. Defaults to "en_US". |