chore: 충돌 해결

GDSC-Hongik · Jul 27, 2024 · 27fdab2 · 27fdab2
1 parent ec80971
commit 27fdab2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 204 deletions.
diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py
diff --git a/accounts/migrations/0002_alter_user_email.py b/accounts/migrations/0002_alter_user_email.py
diff --git a/accounts/migrations/0003_alter_user_nickname.py b/accounts/migrations/0003_alter_user_nickname.py
diff --git a/accounts/migrations/__init__.py b/accounts/migrations/__init__.py
diff --git a/mustgou/settings.py b/mustgou/settings.py
@@ -41,7 +41,6 @@
     "rest_framework",
     "rest_framework.authtoken",
     "accounts",
-    "myapp",
     "users",
     "friends",
     "restaurants",

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,4 @@
 asgiref==3.8.1
-backports.zoneinfo==0.2.1
 Django==4.2.14
 djangorestframework==3.15.2
 pillow==10.4.0