mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2024-11-10 01:17:42 +01:00
fix conflicts with #62
This commit is contained in:
parent
cb60b6d5c5
commit
2ebc659bcf
1 changed files with 1 additions and 1 deletions
|
@ -194,7 +194,7 @@ class UploadController:
|
||||||
|
|
||||||
# get the hop addition times
|
# get the hop addition times
|
||||||
|
|
||||||
c.execute('SELECT Zeit FROM Hopfengaben WHERE Vorderwuerze <> 1 AND SudID = ?', (Recipe_ID,))
|
c.execute('SELECT Zeit, Name FROM Hopfengaben WHERE Vorderwuerze <> 1 AND SudID = ?', (Recipe_ID,))
|
||||||
hops = c.fetchall()
|
hops = c.fetchall()
|
||||||
whirlpool = []
|
whirlpool = []
|
||||||
for hop in hops:
|
for hop in hops:
|
||||||
|
|
Loading…
Reference in a new issue