darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 02:23:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merging conflict with two_factor.py

Browse Source 
Fixed merge mistake with two_factor.py.
This commit is contained in:
Nicholas Staples
2016-03-30 10:11:06 +01:00
parent 62ca57a5de
commit 48daac7b94
11 changed files with 44 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/app/main/views/test_choose_services.py
-1
View File
@@ -1,4 +1,3 @@
from tests import create_test_user
from flask import url_for
import pytest