fixed merge error
This commit is contained in:
parent
b964504336
commit
11c7890f3c
13
config/env/production.js
vendored
13
config/env/production.js
vendored
|
@ -52,25 +52,12 @@ module.exports = {
|
||||||
callbackURL: '/auth/github/callback'
|
callbackURL: '/auth/github/callback'
|
||||||
},
|
},
|
||||||
mailer: {
|
mailer: {
|
||||||
<<<<<<< HEAD
|
|
||||||
from: process.env.MAILER_FROM || 'testing@' + process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com',
|
|
||||||
options: {
|
|
||||||
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
|
||||||
/*ssl: false,
|
|
||||||
host: 'smtp.sparkpostmail.com',
|
|
||||||
port: 587,
|
|
||||||
secure: false,*/
|
|
||||||
auth: {
|
|
||||||
user: process.env.SPARKPOST_SMTP_USERNAME || process.env.MAILER_EMAIL_ID || '',
|
|
||||||
pass: process.env.SPARKPOST_SMTP_PASSWORD || process.env.MAILER_PASSWORD || ''
|
|
||||||
=======
|
|
||||||
from: process.env.MAILER_FROM || 'testing@'+process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com',
|
from: process.env.MAILER_FROM || 'testing@'+process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com',
|
||||||
options: {
|
options: {
|
||||||
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.MAILER_EMAIL_ID || process.env.SPARKPOST_SMTP_USERNAME || '',
|
user: process.env.MAILER_EMAIL_ID || process.env.SPARKPOST_SMTP_USERNAME || '',
|
||||||
pass: process.env.MAILER_PASSWORD || process.env.SPARKPOST_SMTP_PASSWORD || ''
|
pass: process.env.MAILER_PASSWORD || process.env.SPARKPOST_SMTP_PASSWORD || ''
|
||||||
>>>>>>> c08daea2ccfe85231755dc239fa1aff0ee8f5029
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue