Resolve merge conflicts using Webstorm's merge integration tool. v2

2015-04-17 00:39:48 -04:00
parent b49d2fd343
commit b9372b9af6
4 changed files with 6 additions and 35 deletions
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -359,16 +359,6 @@ exports.storySubmission = function(req, res, next) {
    });
 };

-  story.save(function(err) {
-    if (err) {
-      return next(err);
-    }
-    res.send(JSON.stringify({
-      storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
-    }));
-  });
-};
-
 exports.commentSubmit = function(req, res, next) {
  var data = req.body.data;
  if (req.user._id.toString() !== data.author.userId.toString()) {