Reslove conflicts

Signed-off-by: Khanh Ngo <khanh.ngo@taxfix.de>
This commit is contained in:
Khanh Ngo
2021-10-30 21:15:04 +02:00
4 changed files with 8 additions and 2 deletions

View File

@ -185,6 +185,7 @@ class Setting(db.Model):
},
'ttl_options': '1 minute,5 minutes,30 minutes,60 minutes,24 hours',
'otp_field_enabled': True,
'custom_css': '',
}
def __init__(self, id=None, name=None, value=None):