From fdb0935d6a352e9e7fd86acb023f2830c30fd464 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 23 Mar 2015 18:36:38 -0700
Subject: [PATCH] Fix resolveConflicts for groups

---
 js/models/conversations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 44cfcc8b2..6d247eecd 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -229,7 +229,7 @@
     resolveConflicts: function(number) {
         if (this.isPrivate()) {
             number = this.id;
-        } else if (!_.find(this.get('members'), number)) {
+        } else if (!_.include(this.get('members'), number)) {
             throw 'Tried to resolve conflicts for a unknown group member';
         }