Skip to content

Commit

Permalink
Update controller.js
Browse files Browse the repository at this point in the history
  • Loading branch information
banterglow authored and aj-4 committed Jan 12, 2018
1 parent 9aece62 commit d1da7cc
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions server/controller.js
Original file line number Diff line number Diff line change
@@ -3,8 +3,13 @@ const db = require('../database/index.js');
const AWS = require('aws-sdk');

AWS.config.update({
<<<<<<< HEAD
accessKeyId: process.env.AWS_ACCESS_KEY_ID || 'key only available in staging or prod',
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY || 'key only available in staging or prod',
=======
accessKeyId: '',
secretAccessKey: '',
>>>>>>> Update controller.js
region: 'us-west-1'
});

0 comments on commit d1da7cc

Please sign in to comment.