fixup! fix imports

openedx · Jan 26, 2024 · 0bfa22b · 0bfa22b
1 parent 16b6624
commit 0bfa22b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/edx_rest_framework_extensions/auth/jwt/tests/test_authentication.py b/edx_rest_framework_extensions/auth/jwt/tests/test_authentication.py
@@ -32,10 +32,14 @@
     generate_jwt_token,
     generate_latest_version_payload,
 )
+<<<<<<< HEAD
 from edx_rest_framework_extensions.config import (
     ENABLE_JWT_AND_LMS_USER_EMAIL_MATCH,
     ENABLE_SET_REQUEST_USER_FOR_JWT_COOKIE,
 )
+=======
+from edx_rest_framework_extensions.config import ENABLE_SET_REQUEST_USER_FOR_JWT_COOKIE
+>>>>>>> 7d931d2 (fixup! fix imports)
 from edx_rest_framework_extensions.tests import factories