Add missing resolve

2015-04-15 12:24:29 -07:00 · 2015-04-15 12:24:29 -07:00 · de65f9e6bd
parent b5d724ffc3
commit de65f9e6bd
1 changed files with 2 additions and 1 deletions
--- 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();