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

modules/base_plugins/brew_steps/__init__.py

@@ -57,11 +57,7 @@ class MashStep(StepBase):
 
         # 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()