Skip to content

R
red-ci-cd
Commit 0f456296 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

fixing conflicts on product dev

parent f6531d60
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 16 deletions
config/settings/base.py
View file @ 0f456296
...@@ -165,22 +165,6 @@ REST_FRAMEWORK = { ...@@ -165,22 +165,6 @@ REST_FRAMEWORK = {
'PAGE_SIZE': 10 'PAGE_SIZE': 10
} }
<<<<<<< HEAD
=======
# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
# EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
# EMAIL_PORT = 587
# EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
# EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
# EMAIL_USE_SSL = False
# EMAIL_USE_TLS = True
# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
>>>>>>> 585ee9ce5bff84b4f108c6f5928f939b1f3b733d
EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates") EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com' EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
...@@ -192,6 +176,7 @@ EMAIL_USE_TLS = True ...@@ -192,6 +176,7 @@ EMAIL_USE_TLS = True
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com' EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates") # EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
......
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