3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-27 00:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflict resolution

Browse source 
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
This commit is contained in:
Ghostkeeper 2016-03-04 11:23:35 +01:00
parent a9bd73f32a
commit a785c9a205
No known key found for this signature in database
GPG key ID: 701948C5954A7385
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/machines/dual_extrusion_printer.json
View file

@ -7,7 +7,6 @@
"visible": false, "visible": false,
"machine_extruder_trains": { "machine_extruder_trains": {
"0": { "0": {
"extruder_nr": { "default": 0 }, "extruder_nr": { "default": 0 },
@ -127,7 +126,7 @@
"default": 0, "default": 0,
"min_value": "0", "min_value": "0",
"max_value": "16", "max_value": "16",
"enabled": "support_roof_enable" "enabled": "support_roof_enable",
"global_only": true "global_only": true
} }
} }