merge conflict fix

2021-12-20 11:19:37 +02:00 · 2021-12-20 11:19:37 +02:00 · e6f0f843de
parent fe150efb70
commit e6f0f843de
1 changed files with 1 additions and 1 deletions
--- a/powerdnsadmin/models/setting.py
+++ b/powerdnsadmin/models/setting.py
@ -197,7 +197,7 @@ class Setting(db.Model):
        'pwd_must_not_contain' : 'username,firstname',
        'max_history_records': 1000,
        'zxcvbn_enabled': False,
-        'zxcvbn_guesses_log' : 11
+        'zxcvbn_guesses_log' : 11,
        'otp_force': False,
        'max_history_records': 1000
    }