3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 07:48:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 25
Cura/plugins/Marketplace/resources
History
Jelle Spijker e37f08790f
Fixed a merge conflict 
And not in a neat way. I'm a shamed to say copy-paste was used extensively.

Contributes to: CURA-8587
2021-12-03 13:51:43 +01:00
..
images Add placeholder image 2021-11-09 15:51:34 +01:00
qml Fixed a merge conflict 2021-12-03 13:51:43 +01:00