pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove merge error related lines

Browse source
This commit is contained in:
Ross Hendrickson 2013-08-02 19:24:11 -06:00
parent 1f3160571c
commit 2831ab0727
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
octoprint/server.py
View file

@ -573,19 +573,14 @@ def getSettings():
"profiles": s.get(["temperature", "profiles"])
},
"system": {
<<<<<<< HEAD
"actions": s.get(["system", "actions"])
"events": s.get(["system", "events"])
},
"curaEngine": {
"enabled": s.getBoolean(["curaEngine", "enabled"]),
"path": s.get(["curaEngine", "path"]),
"config": s.get(["curaEngine", "config"])
}
=======
"actions": s.get(["system", "actions"]),
"events": s.get(["system", "events"])
}
>>>>>>> devel
})
@app.route(BASEURL + "settings", methods=["POST"])
@ -655,7 +650,8 @@ def setSettings():
if "system" in data.keys():
if "actions" in data["system"].keys(): s.set(["system", "actions"], data["system"]["actions"])
<<<<<<< HEAD
if "events" in data["system"].keys(): s.set(["system", "events"], data["system"]["events"])
curaEngine = data.get("curaEngine", None)
@ -672,9 +668,6 @@ def setSettings():
enabled = curaEngine.get("enabled")
s.setBoolean(["curaEngine", "enabled"], enabled)
=======
if "events" in data["system"].keys(): s.set(["system", "events"], data["system"]["events"])
>>>>>>> devel
s.save()
return getSettings()