From ad02e2490d386fca7369ad7ae4dd3f1125221de5 Mon Sep 17 00:00:00 2001 From: swimIan Date: Sat, 15 Jul 2017 22:08:52 -0700 Subject: [PATCH] Remove spaces --- modules/recipe_import/beerxml.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/recipe_import/beerxml.py b/modules/recipe_import/beerxml.py index 67645e5..8a1f0c3 100644 --- a/modules/recipe_import/beerxml.py +++ b/modules/recipe_import/beerxml.py @@ -66,13 +66,9 @@ class BeerXMLImport(FlaskView): try: -<<<<<<< HEAD - ## Add Mashin step - Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": mashin_temp}}) -======= + ## Add Mashin step Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": mashin_temp}}) ->>>>>>> f60658c84e6728e07ccb4f3b46c08c7d7497073b 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": "ChilStep", "type": "ChilStep", "config": {"timer": 15}})