Merging conflict with two_factor.py

Fixed merge mistake with two_factor.py.
This commit is contained in:
Nicholas Staples
2016-03-30 09:58:10 +01:00
parent 62ca57a5de
commit 48daac7b94
11 changed files with 44 additions and 123 deletions

View File

@@ -1,4 +1,3 @@
from app.main.dao import users_dao
from app.main.forms import RegisterUserForm