fixed conflict

1 files changed, 1 insertions, 0 deletions

diff --git a/app.js b/app.js
index f629d2f..0b7eb57 100644
--- a/app.js
+++ b/app.js
@@ -57,6 +57,7 @@ app.use(function(req, res, next) {
     res.locals.login = req.isAuthenticated(); // global variable
     res.locals.session = req.session;
     res.locals.user = req.user;
+    res.locals.messages = req.session.messages;
     next();
 });