(WIP) resolving merge conflict

2026-06-04 02:20:41 +00:00 · 2024-05-19 15:49:13 +00:00
parent 3c35f78d8f
commit 78a875d5b2
13 changed files with 1 additions and 0 deletions
--- a/backend/api_app/pycache/init.cpython-311.pyc
+++ b/backend/api_app/pycache/init.cpython-311.pyc
--- a/backend/api_app/pycache/admin.cpython-311.pyc
+++ b/backend/api_app/pycache/admin.cpython-311.pyc
--- a/backend/api_app/pycache/apps.cpython-311.pyc
+++ b/backend/api_app/pycache/apps.cpython-311.pyc
--- a/backend/api_app/pycache/models.cpython-311.pyc
+++ b/backend/api_app/pycache/models.cpython-311.pyc
--- a/backend/api_app/pycache/urls.cpython-311.pyc
+++ b/backend/api_app/pycache/urls.cpython-311.pyc
--- a/backend/api_app/pycache/utils.cpython-311.pyc
+++ b/backend/api_app/pycache/utils.cpython-311.pyc
--- a/backend/api_app/pycache/views.cpython-311.pyc
+++ b/backend/api_app/pycache/views.cpython-311.pyc
--- a/backend/api_app/migrations/pycache/init.cpython-311.pyc
+++ b/backend/api_app/migrations/pycache/init.cpython-311.pyc
--- a/backend/deep_impact_proj/pycache/init.cpython-311.pyc
+++ b/backend/deep_impact_proj/pycache/init.cpython-311.pyc
--- a/backend/deep_impact_proj/pycache/settings.cpython-311.pyc
+++ b/backend/deep_impact_proj/pycache/settings.cpython-311.pyc
--- a/backend/deep_impact_proj/pycache/urls.cpython-311.pyc
+++ b/backend/deep_impact_proj/pycache/urls.cpython-311.pyc
--- a/backend/deep_impact_proj/pycache/wsgi.cpython-311.pyc
+++ b/backend/deep_impact_proj/pycache/wsgi.cpython-311.pyc
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -0,0 +1 @@
+.env