fix conflicts

sgmagar · sgmagar · commit d4b13910c6e8 · 2024-07-04T22:12:53.000+05:45
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
@@ -1,4 +1,5 @@
 .terraform
+.idea/
 staticfiles/
 postgres-data/
 
diff --git a/{{cookiecutter.project_slug}}/Pipfile.lock b/{{cookiecutter.project_slug}}/Pipfile.lock
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/settings.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/settings.py
@@ -235,6 +235,10 @@
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
 
+DEFAULT_FROM_EMAIL = env.str(
+    "DEFAULT_FROM_EMAIL", "{{cookiecutter.project_name}} Support <support@{{cookiecutter.custom_domain}}>"
+)
+
 
 # AWS S3 config
 AWS_ACCESS_KEY_ID = env.str("AWS_ACCESS_KEY_ID", "")
