rushilwiz/spaceout
1
0
Fork 0
mirror of https://github.com/Rushilwiz/spaceout.git synced 2025-04-17 01:50:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Rushil Umaretiya 2020-12-12 22:13:12 -05:00
parent 50de963af3
commit 652b0bc856
No known key found for this signature in database
GPG Key ID: 4E8FAF9C926AF959
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
site/config/settings.py
View File

@ -98,18 +98,6 @@ DATABASES = {
} }
} }
<<<<<<< HEAD
# DATABASES = {
# 'default': {
# 'ENGINE' : 'django_cockroachdb',
# 'NAME' : 'spaceout',
# 'USER' : 'spaceout',
# 'PASSWORD': 'spaceout',
# 'HOST' : 'localhost',
# 'PORT' : 35767,
# }
# }
=======
#DATABASES = { #DATABASES = {
# 'default': { # 'default': {
# 'ENGINE' : 'django_cockroachdb', # 'ENGINE' : 'django_cockroachdb',
@ -120,7 +108,6 @@ DATABASES = {
# 'PORT' : 35767, # 'PORT' : 35767,
# } # }
#} #}
>>>>>>> 07ec7ef3fe47bc84bac30aa9e368410217511f88
# Password validation # Password validation