diff options
Diffstat (limited to 'resources/profiles/INAT.ini')
| -rw-r--r-- | resources/profiles/INAT.ini | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/resources/profiles/INAT.ini b/resources/profiles/INAT.ini index 588728947..3c1a753b5 100644 --- a/resources/profiles/INAT.ini +++ b/resources/profiles/INAT.ini @@ -3,11 +3,7 @@ [vendor] # Vendor name will be shown by the Config Wizard. name = INAT -<<<<<<< HEAD -config_version = 0.0.2 -======= config_version = 0.0.3 ->>>>>>> master config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/INAT/ ### @@ -19,20 +15,14 @@ name = INAT Proton X Rail variants = 0.4 technology = FFF family = Proton -<<<<<<< HEAD -======= default_materials = PLA @PROTON_X ->>>>>>> master [printer_model:PROTON_X_ROD] name = INAT Proton X Rod variants = 0.4 technology = FFF family = Proton -<<<<<<< HEAD -======= default_materials = PLA @PROTON_X ->>>>>>> master ### |