beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed merge error

Browse source
This commit is contained in:
David Baldwynn 2017-03-30 12:33:58 -07:00
parent b964504336
commit 11c7890f3c
No known key found for this signature in database
GPG key ID: 15D1C13202224A9B
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
config/env/production.js vendored
View file

@ -52,25 +52,12 @@ module.exports = {
callbackURL: '/auth/github/callback'
},
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',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || '',
auth: {
user: process.env.MAILER_EMAIL_ID || process.env.SPARKPOST_SMTP_USERNAME || '',
pass: process.env.MAILER_PASSWORD || process.env.SPARKPOST_SMTP_PASSWORD || ''
>>>>>>> c08daea2ccfe85231755dc239fa1aff0ee8f5029
}
}
}