We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent a179750 commit 139c0c9Copy full SHA for 139c0c9
api_tests/users/views/test_user_settings.py
@@ -7,7 +7,13 @@
7
AuthUserFactory,
8
UserFactory,
9
)
10
+<<<<<<< HEAD
11
from osf.models import Email, NotableDomain, NotificationType
12
+=======
13
+from django.middleware import csrf
14
+from django.core.cache import cache
15
+from osf.models import Email, NotableDomain
16
+>>>>>>> 7a53306cea (reset throttle cache)
17
from framework.auth.views import auth_email_logout
18
from tests.utils import capture_notifications
19
0 commit comments