Fix test settings file

mkalioby · Oct 28, 2023 · ac02b78 · ac02b78
1 parent fa5bb5b
commit ac02b78
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/example/test_app/test_settings.py b/example/test_app/test_settings.py
@@ -133,7 +133,4 @@
 FIDO_SERVER_ID="testserver"      # Server rp id for FIDO2, it the full domain of your project
 FIDO_SERVER_NAME="TestApp"
 KEY_ATTACHMENT = passkeys.Attachment.PLATFORM
-<<<<<<< Updated upstream
-=======
 CSRF_TRUSTED_ORIGINS = ['http://localhost:8000','https://localhost:8000']
->>>>>>> Stashed changes