Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri
2020-03-09 16:03:15 +01:00
71 changed files with 3264 additions and 2633 deletions
-1
View File
@@ -213,7 +213,6 @@ public:
void fix_through_netfabb(const int obj_idx, const int vol_idx = -1);
void send_gcode();
void eject_drive();
void drive_ejected_callback();
void take_snapshot(const std::string &snapshot_name);
void take_snapshot(const wxString &snapshot_name);