fix merge conflict, for real this time

This commit is contained in:
catarak 2016-06-13 16:25:56 -04:00
parent 34d770630f
commit 9e366fdc17

View file

@ -49,8 +49,6 @@ mongoose.connection.on('error', () => {
process.exit(1);
});
const passportConfig = require('./config/passport');
app.get("/", function(req, res) {
res.sendFile(path.resolve(__dirname + '/../index.html'));
})