1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2025-04-18 05:10:46 +02:00

fix conflicts with

This commit is contained in:
lopelex 2022-10-03 16:28:42 +02:00
parent cb60b6d5c5
commit 2ebc659bcf

View file

@ -194,7 +194,7 @@ class UploadController:
# 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()
whirlpool = []
for hop in hops: