From a442017cd53615b4fcdc95b1a923013184d09d84 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 15 Jul 2021 21:21:47 +0200
Subject: [PATCH] save lost

---
 frontend/src/locales/en.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 9062d3d5c..79d811f78 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -43,11 +43,7 @@
     "close":"Close",
     "edit": "Edit",
     "save": "save",
-<<<<<<< HEAD
     "recipient":"Recipient",
-=======
-    "receiver":"Recipient",
->>>>>>> 86e253ac0495b36b1ce3a07eeb9d35dae9abced2
     "sender":"Sender",
     "username":"Username",
     "firstname":"Firstname",