From 731052ad0a31ea743485e53effb2845b8f4f865f Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 11 Feb 2016 14:15:28 -0800
Subject: [PATCH] Clear old key conflict errors after failed replay

If the replay failed due to a bad mac or other decryption error for some
other reason we still want to clear the conflict. If it failed because
it's still in conflict then the newly returned error will reflect that
and be saved.

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

diff --git a/js/models/messages.js b/js/models/messages.js
index 0b386f64..9dbd3212 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -246,6 +246,7 @@
                     }.bind(this));
                 }
                 promise.catch(function(e) {
+                    this.removeConflictFor(number);
                     this.saveErrors(e);
                 }.bind(this));