Skip to content

W
widget_django unchained
Commit 43002d6f authored by Joshua Son's avatar Joshua Son
Browse files
Options

Replace settings.py

parent e2d5715c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 11 deletions
widget_django_unchained/widget_django_unchained/settings.py
View file @ 43002d6f
...@@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/3.2/ref/settings/ ...@@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/3.2/ref/settings/
import os import os
from pathlib import Path from pathlib import Path
import environ import environ
import os
env = environ.Env() env = environ.Env()
environ.Env.read_env() environ.Env.read_env()
...@@ -126,14 +125,6 @@ USE_TZ = True ...@@ -126,14 +125,6 @@ USE_TZ = True
# https://docs.djangoproject.com/en/3.2/howto/static-files/ # https://docs.djangoproject.com/en/3.2/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = '/static/'
<<<<<<< HEAD
MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
STATICFILES_DIR = (
os.path.join(BASE_DIR, 'statics')
)
=======
MEDIA_URL = '/images/' MEDIA_URL = '/images/'
STATICFILES_DIRS = [ STATICFILES_DIRS = [
...@@ -141,9 +132,8 @@ STATICFILES_DIRS = [ ...@@ -141,9 +132,8 @@ STATICFILES_DIRS = [
] ]
MEDIA_ROOT = os.path.join(BASE_DIR, 'static/images') MEDIA_ROOT = os.path.join(BASE_DIR, 'static/images')
>>>>>>> cfaf9ababe2607db22a5f225df2d8f007ea1dc50
# Default primary key field type # Default primary key field type
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment