resolving conflicts with the server

DaemonLab · Dec 28, 2023 · 0e7cf35 · 0e7cf35
1 parent 27f4468
commit 0e7cf35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10
+FROM python:3.11
 
 ENV PYTHONUNBUFFERED 1
 

diff --git a/home/utils/django_email_server.py b/home/utils/django_email_server.py
@@ -57,7 +57,7 @@ def send_html(subject, message, recipient):
 message_long_rebate_query = """
 Dear Student,
 Your long term rebate application from {start_date} to {end_date} has been recieved but contains some issues.
-Kindly send your long rebate application photograph as a reply to this mail itself itself.
+Kindly send your long rebate application photograph as a reply to this mail itself.
 """
 
 

diff --git a/messWebsite/settings.py b/messWebsite/settings.py
@@ -193,9 +193,9 @@
 
 DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.RawMediaCloudinaryStorage'
 DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.MediaCloudinaryStorage'
-# MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
 MEDIA_URL= '/media/'
 
+
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field