From e6f0f843de27de4bdf0b1f597ce6f41f5151d150 Mon Sep 17 00:00:00 2001
From: kkmanos <koukoularisman@gmail.com>
Date: Mon, 20 Dec 2021 11:19:37 +0200
Subject: [PATCH] merge conflict fix

---
 powerdnsadmin/models/setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/powerdnsadmin/models/setting.py b/powerdnsadmin/models/setting.py
index 1e49aaa..0427b11 100644
--- 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
     }