From 9f4b0aec6bf9d5aa957d4ba3d60657d5b38bddb3 Mon Sep 17 00:00:00 2001 From: Mega-Mewthree Date: Mon, 13 Aug 2018 13:23:14 -0700 Subject: [PATCH] Forgot to save stuff. (#8) --- client/src/builtin/E2EE.js | 3 --- client/src/builtin/E2EEComponent.vue | 35 ---------------------------- client/webpack.production.config.js | 2 +- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/client/src/builtin/E2EE.js b/client/src/builtin/E2EE.js index 045f5117..24c12652 100644 --- a/client/src/builtin/E2EE.js +++ b/client/src/builtin/E2EE.js @@ -90,8 +90,6 @@ export default new class E2EE extends BuiltinModule { Settings.getSetting('security', 'e2eedb', 'e2ekvps').addItem({ value: { key: channelId, value: key } }); } -<<<<<<< Updated upstream -======= get ecdhStorage() { return this._ecdhStorage || (this._ecdhStorage = {}); } @@ -115,7 +113,6 @@ export default new class E2EE extends BuiltinModule { } } ->>>>>>> Stashed changes async enabled(e) { seed = Security.randomBytes(); // TODO Input modal for key diff --git a/client/src/builtin/E2EEComponent.vue b/client/src/builtin/E2EEComponent.vue index 4e6f1259..ee882051 100644 --- a/client/src/builtin/E2EEComponent.vue +++ b/client/src/builtin/E2EEComponent.vue @@ -9,11 +9,7 @@ */