fixup! fix imports

openedx · Jan 26, 2024 · dc860eb · dc860eb
1 parent 0bfa22b
commit dc860eb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 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,14 +32,11 @@
     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
 
 

diff --git a/edx_rest_framework_extensions/settings.py b/edx_rest_framework_extensions/settings.py
@@ -27,6 +27,7 @@
 DEFAULT_SETTINGS = {
     ENABLE_JWT_AND_LMS_USER_EMAIL_MATCH: False,
     ENABLE_SET_REQUEST_USER_FOR_JWT_COOKIE: False,
+    ENABLE_JWT_AND_LMS_USER_EMAIL_MATCH: False,
 
     'JWT_PAYLOAD_MERGEABLE_USER_ATTRIBUTES': (),
     # Map JWT claims to user attributes.