Merge conflic solved

[cura.git] / Cura / util / profile.py

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 3bdfbb2cba979b4bed76b0313dc6c315b9ce4e60..7f999961ba59ec91aff4b1190a0c9438f00b7cdb 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -64,8 +64,10 @@ profileDefaultSettings = {
        'bridge_material_amount': '100',\r
        'raft_margin': '5',\r
        'raft_base_material_amount': '100',\r
-       'raft_interface_material_amount': '100',\r
+       'raft_interface_material_amount': '100',
        'bottom_thickness': '0.3',\r
+       'add_start_end_gcode': 'True',\r
+       'gcode_extension': 'gcode',
 }\r
 preferencesDefaultSettings = {\r
        'wizardDone': 'False',\r