From 03905ef90b2f90696d9ee35a9c3e75bb788fa7c3 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 8 Nov 2013 17:09:06 +0100
Subject: [PATCH] solve conflicts 3

---
 src/controllers/groups.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index fddc77ae51..8632d6e48d 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -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);
   });
 }