fix merge conflict, for real this time
This commit is contained in:
parent
34d770630f
commit
9e366fdc17
1 changed files with 0 additions and 2 deletions
|
@ -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'));
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue