michal/craftbeerpi3
1
0
Fork 0
mirror of https://github.com/Manuel83/craftbeerpi3 synced 2026-08-10 02:55:27 +02:00
Code Issues Releases Wiki Activity

Remove spaces

Browse Source
This commit is contained in:
swimIan
2017-07-15 22:21:27 -07:00
parent eb715fabb6
commit b9b3fee8c9
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/recipe_import/beerxml.py
+1 -5
View File
@@ -66,13 +66,9 @@ class BeerXMLImport(FlaskView):
try: try:
<<<<<<< HEAD
## Add Mashin step
Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": mashin_temp}})
=======
## Add Mashin step ## Add Mashin step
Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": mashin_temp}}) Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": mashin_temp}})
>>>>>>> f60658c84e6728e07ccb4f3b46c08c7d7497073b
for row in steps: for row in steps:
Step.insert(**{"name": row.get("name"), "type": mashstep_type, "config": {"kettle": mash_kettle, "temp": float(row.get("temp")), "timer": row.get("timer")}}) Step.insert(**{"name": row.get("name"), "type": mashstep_type, "config": {"kettle": mash_kettle, "temp": float(row.get("temp")), "timer": row.get("timer")}})
Step.insert(**{"name": "ChilStep", "type": "ChilStep", "config": {"timer": 15}}) Step.insert(**{"name": "ChilStep", "type": "ChilStep", "config": {"timer": 15}})