From 11c7890f3cd1aea57c534f012a1dedac691876b4 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 12:33:58 -0700 Subject: [PATCH] fixed merge error --- config/env/production.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/config/env/production.js b/config/env/production.js index 114676aa..a864a1ca 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -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 } } }