resolved conflict

1 files changed, 0 insertions, 2 deletions

diff --git a/routes/index.js b/routes/index.js
index e4a841e..56401de 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -162,7 +162,6 @@ router.get('/signup', function(req, res, next) {
 
 router.get('/signup/failed', function(req, res, next) {
     var msg = req.flash('error');
-    console.log('message is: ' + msg);
 
     res.render('signup', {csrfToken: req.csrfToken(),
         success: req.session.success,
@@ -171,7 +170,6 @@ router.get('/signup/failed', function(req, res, next) {
 });
 
 
-
 router.get('/signin', function (req, res, next) {
     res.render('signin', {csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
 });