michal/craftbeerpi3
1
0
Fork 0
mirror of https://github.com/Manuel83/craftbeerpi3 synced 2026-09-19 15:59:07 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
swimIan
2017-07-21 14:58:52 -07:00
parent 124a03bd0f 1c4e16e358
commit aa3420efc8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base_plugins/brew_steps/__init__.py
-4
View File
@@ -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()