🐞 fixed merge conflict errors

ref #13 #12
2021-01-26 18:25:30 +01:00
parent 9a1f7a13f8
commit cbc1d53cc2
5 changed files with 12 additions and 3 deletions
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -103,6 +103,7 @@
    "lfk-is-os": "The \"Lauf für Kaya!\" Frontend is (like all other projects for the \"LfK!\" Also) an open source project.",
    "license": "License",
    "licenses-are-being-loaded": "Licenses are being loaded...",
+    "loading-runners": "loading runners...",
    "log_in": "Log in",
    "log_in_to_your_account": "Log in to your account",
    "login_is_checked": "Login is being checked...",