From 26fd677098e28c6814e4b94f8e46d678483d0743 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 14 Apr 2022 09:47:45 +0200
Subject: [PATCH] resolve conflict

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

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 0777fdfba..4734abf00 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -111,7 +111,7 @@
     "link-overview": "Link overview",
     "links_count": "Active links",
     "links_sum": "Open links and QR codes",
-    "no-account": "You don't have a Gradido account yet",
+    "no-account": "You don't have a Gradido account yet?",
     "no-redeem": "You not allowed to redeem your own link!",
     "not-copied": "Could not copy link: {err}",
     "redeem": "Redeem",
@@ -120,7 +120,7 @@
     "redeemed-at": "The link was already redeemed on {date}.",
     "redeemed-title": "redeemed",
     "to-login": "Log in",
-    "to-register": "Register a new account",
+    "to-register": "Register a new account.",
     "valid_until": "Valid until"
   },
   "gdt": {