Merge branch 'patch2' of https://github.com/swimIan/craftbeerpi3 into…

… patch2
MarcioMonego · Jul 21, 2017 · aa3420e · aa3420e
2 parents 124a03b + 1c4e16e
commit aa3420e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py
@@ -57,11 +57,7 @@ def execute(self):
 
         # Check if timer finished and go to next step
         if self.is_timer_finished() == True:
-<<<<<<< HEAD
             self.notify("Mash Step Completed!", "Starting the next step", timeout=None)
-=======
-            self.notify("Step Completed!", "Starting the next step", timeout=None)
->>>>>>> 1c4e16e35839ec699a431a3840d7dfda9430c4cf
             self.next()