mirror of
https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git
synced 2025-09-29 00:23:12 +08:00
FIX: unfinished merge conflict
jira: [none] Change-Id: Id97c30a091957c7fe7c96f1818d1073f7993b581
This commit is contained in:
parent
32f02721ca
commit
8ca806abdf
@ -1,5 +1 @@
|
|||||||
<<<<<<< HEAD (9f2e21 FIX: protect the EndModal functions while top dialog is not )
|
|
||||||
02.00.00.14
|
|
||||||
=======
|
|
||||||
02.00.00.17
|
02.00.00.17
|
||||||
>>>>>>> CHANGE (04056a ENH: update temperature limit for all printer)
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user