r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

fix merge conflict, for real this time

Browse source
This commit is contained in:
catarak 2016-06-13 16:25:56 -04:00
parent 34d770630f
commit 9e366fdc17
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/server.js
View file

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