Fix build (merge conflict)
This commit is contained in:
parent
67e6361ff1
commit
1523194d3b
|
|
@ -48,7 +48,7 @@ void lcd_pause_print();
|
|||
void lcd_pause_usb_print();
|
||||
void lcd_resume_print();
|
||||
void lcd_print_stop();
|
||||
void prusa_statistics(int _message, uint8_t _col_nr = 0);
|
||||
void prusa_statistics(uint8_t _message, uint8_t _col_nr = 0);
|
||||
void lcd_load_filament_color_check();
|
||||
//void lcd_mylang();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue