Async remove identity

2026-05-08 08:58:38 +01:00 · 2015-04-09 14:58:26 -07:00
parent 26f1aa4db5
commit 71715c95bc
4 changed files with 12 additions and 12 deletions
@@ -41,8 +41,7 @@
        },
        resolve: function() {
            new Promise(function(resolve) {
-                this.conversation.resolveConflicts(this.model.number);
-                resolve();
+                this.conversation.resolveConflicts(this.model.number).then(resolve);
            }.bind(this));
            this.trigger('resolve');
            this.remove();