solve conflicts 3

2013-11-08 17:09:06 +01:00
parent e1b86c64a6
commit 03905ef90b
1 changed files with 1 additions and 1 deletions
@@ -261,7 +261,7 @@ api.deleteChatMessage = function(req, res){

  Group.update({_id:group._id}, {$pull:{chat:{id: req.params.messageId}}}, function(err){
    if(err) return res.json(500, {err: err});
-    
+    return chatUpdated ? res.json({chat: group.chat}) : res.send(204);
  });
 }