diff options
Diffstat (limited to 'src/slic3r/GUI/MsgDialog.hpp')
| -rw-r--r-- | src/slic3r/GUI/MsgDialog.hpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp index ac88f7ff5..874629343 100644 --- a/src/slic3r/GUI/MsgDialog.hpp +++ b/src/slic3r/GUI/MsgDialog.hpp @@ -74,8 +74,6 @@ private: }; -<<<<<<< HEAD -======= // Generic warning dialog, used for displaying exceptions class WarningDialog : public MsgDialog { @@ -306,16 +304,11 @@ public: }; #endif ->>>>>>> master // Generic info dialog, used for displaying exceptions class InfoDialog : public MsgDialog { public: -<<<<<<< HEAD - InfoDialog(wxWindow *parent, const wxString &title, const wxString &msg); -======= InfoDialog(wxWindow *parent, const wxString &title, const wxString &msg, bool is_marked = false, long style = wxOK| wxICON_INFORMATION); ->>>>>>> master InfoDialog(InfoDialog&&) = delete; InfoDialog(const InfoDialog&) = delete; InfoDialog&operator=(InfoDialog&&) = delete; |