Replace settings.py

widget_django_unchained/widget_django_unchained/settings.py

@@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/3.2/ref/settings/
 import os
 from pathlib import Path
 import environ
-import os
 
 env = environ.Env()
 environ.Env.read_env()
@@ -126,14 +125,6 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.2/howto/static-files/
 
 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/'
 
 STATICFILES_DIRS = [
@@ -141,9 +132,8 @@ STATICFILES_DIRS = [
 ]
 
 MEDIA_ROOT = os.path.join(BASE_DIR, 'static/images')
->>>>>>> cfaf9ababe2607db22a5f225df2d8f007ea1dc50
 
 # Default primary key field type
 # 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