refactor: rebase from upstream

re Fallenbagel#490
JoaquinOlivero · May 24, 2024 · 7221671 · 7221671
1 parent 74516bb
commit 7221671
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
@@ -224,10 +224,7 @@
   "components.Layout.VersionStatus.streamdevelop": "Jellyseerr Develop",
   "components.Layout.VersionStatus.streamstable": "Jellyseerr Stable",
   "components.Login.adminerror": "You must use an admin account to sign in.",
-<<<<<<< HEAD
   "components.Login.invalidurlerror": "Unable to connect to {mediaServerName} server.",
-=======
->>>>>>> 0b18995a (feat: blacklist media items)
   "components.Login.credentialerror": "The username or password is incorrect.",
   "components.Login.description": "Since this is your first time logging into {applicationName}, you are required to add a valid email address.",
   "components.Login.email": "Email Address",