tentative https test

also fix broken asgi.py
intuitem · Feb 20, 2024 · 8e966b8 · 8e966b8
1 parent da42e9e
commit 8e966b8
Show file tree

Hide file tree

Showing 3 changed files with 280 additions and 250 deletions.
diff --git a/backend/ciso_assistant/asgi.py b/backend/ciso_assistant/asgi.py
@@ -1,9 +1,5 @@
 """
-<<<<<<<< HEAD:backend/ciso_assistant/asgi.py
 ASGI config for ciso_assistant project.
-========
-ASGI config for mira project.
->>>>>>>> main:mira/asgi.py
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -15,10 +11,6 @@
 
 from django.core.asgi import get_asgi_application
 
-<<<<<<<< HEAD:backend/ciso_assistant/asgi.py
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ciso_assistant.settings")
-========
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mira.settings')
->>>>>>>> main:mira/asgi.py
 
 application = get_asgi_application()