revert all email settings

config/settings/base.py

@@ -159,17 +159,6 @@ REST_FRAMEWORK = {
     '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")
 EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_PORT = 587
@@ -182,7 +171,6 @@ EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
 
 # EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
 
->>>>>>> 4ce8c93... revert all changes on email configurations
 
 EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
 

config/settings/demo.py

@@ -31,22 +31,6 @@ DATABASES = {
     }
 }
 
-<<<<<<< HEAD
-################
-# EMAIL SETTINGS
-################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
-EMAIL_HOST = config['DEMO']['EMAIL_HOST']
-EMAIL_PORT = config['DEMO']['EMAIL_PORT']
-EMAIL_HOST_USER = config['DEMO']['EMAIL_PORT']
-EMAIL_HOST_PASSWORD = config['DEMO']['EMAIL_HOST_PASSWORD']
-EMAIL_USE_SSL = config['DEMO']['EMAIL_USE_SSL']
-EMAIL_USE_TLS = config['DEMO']['EMAIL_USE_TLS']
-EMAIL_BACKEND = config['DEMO']['EMAIL_BACKEND']
-EMAIL_DEFAULT_SENDER = config['DEMO']['EMAIL_DEFAULT_SENDER']
-
-=======
->>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/dev.py

@@ -31,23 +31,6 @@ DATABASES = {
     }
 }
 
-<<<<<<< HEAD
-################
-# EMAIL SETTINGS
-################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
-EMAIL_HOST = config['DEV']['EMAIL_HOST']
-EMAIL_PORT = config['DEV']['EMAIL_PORT']
-EMAIL_HOST_USER = config['DEV']['EMAIL_PORT']
-EMAIL_HOST_PASSWORD = config['DEV']['EMAIL_HOST_PASSWORD']
-EMAIL_USE_SSL = config['DEV']['EMAIL_USE_SSL']
-EMAIL_USE_TLS = config['DEV']['EMAIL_USE_TLS']
-EMAIL_BACKEND = config['DEV']['EMAIL_BACKEND']
-EMAIL_DEFAULT_SENDER = config['DEV']['EMAIL_DEFAULT_SENDER']
-
-
-=======
->>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/local.py

@@ -28,23 +28,6 @@ DATABASES = {
     }
 }
 
-<<<<<<< HEAD
-################
-# EMAIL SETTINGS
-################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
-EMAIL_HOST = config['LOCAL']['EMAIL_HOST']
-EMAIL_PORT = config['LOCAL']['EMAIL_PORT']
-EMAIL_HOST_USER = config['LOCAL']['EMAIL_PORT']
-EMAIL_HOST_PASSWORD = config['LOCAL']['EMAIL_HOST_PASSWORD']
-EMAIL_USE_SSL = config['LOCAL']['EMAIL_USE_SSL']
-EMAIL_USE_TLS = config['LOCAL']['EMAIL_USE_TLS']
-EMAIL_BACKEND = config['LOCAL']['EMAIL_BACKEND']
-EMAIL_DEFAULT_SENDER = config['LOCAL']['EMAIL_DEFAULT_SENDER']
-
-
-=======
->>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************

config/settings/sit.py

@@ -30,22 +30,6 @@ DATABASES = {
     }
 }
 
-<<<<<<< HEAD
-################
-# EMAIL SETTINGS
-################
-EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
-EMAIL_HOST = config['SIT']['EMAIL_HOST']
-EMAIL_PORT = config['SIT']['EMAIL_PORT']
-EMAIL_HOST_USER = config['SIT']['EMAIL_PORT']
-EMAIL_HOST_PASSWORD = config['SIT']['EMAIL_HOST_PASSWORD']
-EMAIL_USE_SSL = config['SIT']['EMAIL_USE_SSL']
-EMAIL_USE_TLS = config['SIT']['EMAIL_USE_TLS']
-EMAIL_BACKEND = config['SIT']['EMAIL_BACKEND']
-EMAIL_DEFAULT_SENDER = config['SIT']['EMAIL_DEFAULT_SENDER']
-
-=======
->>>>>>> 4ce8c93... revert all changes on email configurations
 # ****************
 # PROGRAM SETTINGS
 # ****************