resolve merge conflicts

2015-03-29 00:51:09 +09:00
parent 6a19dc9bda 672df775a2
commit 65a4c923b2
2 changed files with 34 additions and 4 deletions
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -196,10 +196,6 @@ exports.postEmailSignup = function(req, res, next) {
  });
 };

-/**
- * GET /account
- * Profile page.
- */

 exports.getAccount = function(req, res) {
  res.render('account/account', {