From ecf2885a6ce76684c34bea962fac29a59c9f96b2 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 18 Feb 2016 12:24:46 -0800
Subject: [PATCH] Do post-send tasks when resolving conflicts

Fixes #684

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

diff --git a/js/models/messages.js b/js/models/messages.js
index 9dbd3212..1ad9e768 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -240,7 +240,7 @@
                         this.handleDataMessage(dataMessage);
                     }.bind(this));
                 } else {
-                    promise = promise.then(function() {
+                    promise = this.send(promise).then(function() {
                         this.removeConflictFor(number);
                         this.save();
                     }.bind(this));