Fix merge conflicts 1.75

This commit is contained in:
cochcoder
2024-05-06 14:57:21 -04:00
parent 5f16dfd8f2
commit 097e435e20

View File

@@ -18,7 +18,8 @@
], ],
"compatible_printers": [ "compatible_printers": [
"Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Guider 2s 0.4 nozzle" "Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Adventurer 5M Pro 0.8 Nozzle"
], ],
"compatible_printers_condition": "", "compatible_printers_condition": "",
"compatible_prints": [], "compatible_prints": [],