whoops; bad translation merge

folio-org · Oct 25, 2024 · 95d0e9a · 95d0e9a
1 parent 465d301
commit 95d0e9a
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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>code</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