From 9582196e1f901bb9b78e462a1dfaceee55c13d13 Mon Sep 17 00:00:00 2001 From: Aiden Vigue Date: Mon, 15 Feb 2021 11:10:33 -0500 Subject: [PATCH] feat: rebase --- src/i18n/locale/en.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json index eb400ca3..8a8d09df 100644 --- a/src/i18n/locale/en.json +++ b/src/i18n/locale/en.json @@ -148,13 +148,9 @@ "components.PersonDetails.nobiography": "No biography available.", "components.PlexLoginButton.loading": "Loading…", "components.PlexLoginButton.signingin": "Signing in…", -<<<<<<< HEAD - "components.PlexLoginButton.signinwithplex": "Sign In", "components.RegionSelector.regionDefault": "All Regions", "components.RegionSelector.regionServerDefault": "{applicationTitle} Default ({region})", -======= "components.PlexLoginButton.signinwithplex": "Sign In with Plex", ->>>>>>> feat(all): add initial Jellyfin/Emby support "components.RequestBlock.profilechanged": "Quality Profile", "components.RequestBlock.requestoverrides": "Request Overrides", "components.RequestBlock.rootfolder": "Root Folder",