From de65f9e6bd21f76ec6895e0af833969b2630f726 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 15 Apr 2015 12:24:29 -0700
Subject: [PATCH] Add missing resolve

---
 js/views/key_conflict_dialogue_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/views/key_conflict_dialogue_view.js b/js/views/key_conflict_dialogue_view.js
index 065f4a6d3..7daa8b1ca 100644
--- a/js/views/key_conflict_dialogue_view.js
+++ b/js/views/key_conflict_dialogue_view.js
@@ -40,8 +40,9 @@
             }
         },
         resolve: function() {
-            new Promise(function() {
+            new Promise(function(resolve) {
                 this.conversation.resolveConflicts(this.model.number);
+                resolve();
             }.bind(this));
             this.trigger('resolve');
             this.remove();