From e8698e38f275baa3b5a2ebc6724462e50fc755e3 Mon Sep 17 00:00:00 2001
From: Carles Escrig Royo <esroyo@gmail.com>
Date: Wed, 20 Apr 2016 21:09:08 +0200
Subject: [PATCH] Remove unsolved conflict

---
 dev/View/Popup/ComposeOpenPgp.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/dev/View/Popup/ComposeOpenPgp.js b/dev/View/Popup/ComposeOpenPgp.js
index f393c45e1..44205c7e4 100644
--- a/dev/View/Popup/ComposeOpenPgp.js
+++ b/dev/View/Popup/ComposeOpenPgp.js
@@ -456,7 +456,6 @@
 
 		if (aRec && 0 < aRec.length)
 		{
-<<<<<<< HEAD
 			this.encryptKeys(_.uniq(_.compact(_.flatten(_.map(aRec, function (sEmail) {
 				var aKeys = PgpStore.findAllPublicKeysByEmailNotNative(sEmail);
 				return aKeys ? _.map(aKeys, function (oKey) {
@@ -470,19 +469,6 @@
 					};
 				}) : [];
 			}), true)), function (oEncryptKey) {
-=======
-			this.encryptKeys(_.uniq(_.compact(_.map(aRec, function (sEmail) {
-				var oKey = PgpStore.findPublicKeyByEmailNotNative(sEmail) || null;
-				return {
-					'empty': !oKey,
-					'selected': ko.observable(!!oKey),
-					'removable': oIdentity && oIdentity.email() && oIdentity.email() !== sEmail,
-					'users': oKey ? (oKey.users || [sEmail]) : [sEmail],
-					'hash': oKey ? oKey.id.substr(-8).toUpperCase() : '',
-					'key': oKey
-				};
-			})), function (oEncryptKey) {
->>>>>>> master
 				return oEncryptKey.hash;
 			}));