mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add missing resolve

Browse source
This commit is contained in:
lilia 2015-04-15 12:24:29 -07:00
parent b5d724ffc3
commit de65f9e6bd
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/views/key_conflict_dialogue_view.js
View file

@ -40,8 +40,9 @@
} }
}, },
resolve: function() { resolve: function() {
new Promise(function() { new Promise(function(resolve) {
this.conversation.resolveConflicts(this.model.number); this.conversation.resolveConflicts(this.model.number);
resolve();
}.bind(this)); }.bind(this));
this.trigger('resolve'); this.trigger('resolve');
this.remove(); this.remove();