Skip to content

Commit

Permalink
resolve conflictes
Browse files Browse the repository at this point in the history
relates #21
  • Loading branch information
rehabas committed Apr 2, 2020
1 parent a669bfc commit c08501c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ app.get('*', (req, res) => {
res.sendFile(join(__dirname, '..', 'client', 'build', 'index.html'));
});

//app.use(clientError);
//app.use(serverError);
app.use(clientError);
app.use(serverError);

module.exports = app;

0 comments on commit c08501c

Please sign in to comment.