Skip to content

Commit 139c0c9

Browse files
committed
reset throttle cache
1 parent a179750 commit 139c0c9

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

api_tests/users/views/test_user_settings.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
AuthUserFactory,
88
UserFactory,
99
)
10+
<<<<<<< HEAD
1011
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)
1117
from framework.auth.views import auth_email_logout
1218
from tests.utils import capture_notifications
1319

0 commit comments

Comments
 (0)