Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 00:47:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unsolved conflict

Browse source
This commit is contained in:
Carles Escrig Royo 2016-04-20 21:09:08 +02:00
parent 9e133b3cc5
commit e8698e38f2
No known key found for this signature in database
GPG key ID: 5E6F07C704111773
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/View/Popup/ComposeOpenPgp.js
View file

@ -456,7 +456,6 @@
if (aRec && 0 < aRec.length) if (aRec && 0 < aRec.length)
{ {
<<<<<<< HEAD
this.encryptKeys(_.uniq(_.compact(_.flatten(_.map(aRec, function (sEmail) { this.encryptKeys(_.uniq(_.compact(_.flatten(_.map(aRec, function (sEmail) {
var aKeys = PgpStore.findAllPublicKeysByEmailNotNative(sEmail); var aKeys = PgpStore.findAllPublicKeysByEmailNotNative(sEmail);
return aKeys ? _.map(aKeys, function (oKey) { return aKeys ? _.map(aKeys, function (oKey) {
@ -470,19 +469,6 @@
}; };
}) : []; }) : [];
}), true)), function (oEncryptKey) { }), 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; return oEncryptKey.hash;
})); }));