Compare commits
No commits in common. "16176ab713091a079cf755bb57db7531c81b0f48" and "50e3fec210db2b31b8f409658469cecde47a8cac" have entirely different histories.
16176ab713
...
50e3fec210
Binary file not shown.
Binary file not shown.
@ -128,17 +128,10 @@ import os
|
|||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.db.backends.postgresql',
|
'ENGINE': 'django.db.backends.postgresql',
|
||||||
<<<<<<< HEAD
|
|
||||||
'NAME': 'mydatabase',
|
|
||||||
'USER': 'myuser',
|
|
||||||
'PASSWORD': 'mypassword',
|
|
||||||
'HOST': 'db',
|
|
||||||
=======
|
|
||||||
'NAME': '',
|
'NAME': '',
|
||||||
'USER': 'postgres',
|
'USER': 'postgres',
|
||||||
'PASSWORD': 'swydk',
|
'PASSWORD': 'swydk',
|
||||||
'HOST': 'localhost',
|
'HOST': 'localhost',
|
||||||
>>>>>>> 50e3fec210db2b31b8f409658469cecde47a8cac
|
|
||||||
'PORT': '5432',
|
'PORT': '5432',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -4,13 +4,11 @@ charset-normalizer==3.3.2
|
|||||||
Django==5.0.6
|
Django==5.0.6
|
||||||
django-cors-headers==4.4.0
|
django-cors-headers==4.4.0
|
||||||
djangorestframework==3.15.2
|
djangorestframework==3.15.2
|
||||||
djangorestframework-simplejwt==5.3.1
|
|
||||||
gunicorn==23.0.0
|
gunicorn==23.0.0
|
||||||
idna==3.7
|
idna==3.7
|
||||||
packaging==24.1
|
packaging==24.1
|
||||||
pillow==10.4.0
|
pillow==10.4.0
|
||||||
psycopg2-binary==2.9.9
|
psycopg2-binary==2.9.9
|
||||||
PyJWT==2.9.0
|
|
||||||
requests==2.32.3
|
requests==2.32.3
|
||||||
sqlparse==0.5.1
|
sqlparse==0.5.1
|
||||||
typing_extensions==4.12.2
|
typing_extensions==4.12.2
|
||||||
|
Loading…
Reference in New Issue
Block a user