From 95d0e9afd25896b348b5e0ed943c55cdeedeadae Mon Sep 17 00:00:00 2001 From: Zak Burke Date: Fri, 25 Oct 2024 08:28:43 -0400 Subject: [PATCH] whoops; bad translation merge --- translations/stripes-core/en_US.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/translations/stripes-core/en_US.json b/translations/stripes-core/en_US.json index 8dfb33d4b..e6225264e 100644 --- a/translations/stripes-core/en_US.json +++ b/translations/stripes-core/en_US.json @@ -152,17 +152,12 @@ "rtr.idleSession.keepWorking": "Keep working", "rtr.idleSession.sessionExpiredSoSad": "Your session expired due to inactivity.", "rtr.idleSession.logInAgain": "Log in again", -<<<<<<< Updated upstream "title.logout": "Log out", "about.applicationCount": "{count} applications", "about.applicationsVersionsTitle": "Applications/modules/interfaces", "tenantChoose": "Select your tenant/library", "tenantLibrary": "Tenant/Library", "errors.saml.missingToken": "No code query parameter.", - "rtr.fixedLengthSession.timeRemaining": "Your session will end soon! Time remaining:" -} -======= "rtr.fixedLengthSession.timeRemaining": "Your session will end soon! Time remaining:", "logoutComplete": "You have logged out." } ->>>>>>> Stashed changes