1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-18 09:14:27 +00:00

Fixed conflicts after merge with master

This commit is contained in:
enricoturri1966
2020-04-01 15:06:30 +02:00
229 changed files with 27582 additions and 16304 deletions
+1 -1
View File
@@ -220,7 +220,7 @@ private:
void _process_height_tag(const std::string& comment, size_t pos);
// Processes color change tag
void _process_color_change_tag(int extruder);
void _process_color_change_tag(unsigned extruder);
// Processes pause print and custom gcode tag
void _process_pause_print_or_custom_code_tag();