From 1cb5c617c87acb66f057e8bdc5fa83ce58e7d418 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Sat, 28 Dec 2024 23:09:32 -0600 Subject: [PATCH] wip: update --- i18n/en.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index e412989b25..ec12084384 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1333,15 +1333,11 @@ "warning": "Warning", "week": "Week", "welcome": "Welcome", -<<<<<<< HEAD:web/src/lib/i18n/en.json - "welcome_to_immich": "Welcome to immich", - "workflows": "Workflows", -======= "welcome_to_immich": "Welcome to Immich", ->>>>>>> 34ce61d03a206f616325491281882afff4b617f8:i18n/en.json "year": "Year", "years_ago": "{years, plural, one {# year} other {# years}} ago", "yes": "Yes", "you_dont_have_any_shared_links": "You don't have any shared links", - "zoom_image": "Zoom Image" + "zoom_image": "Zoom Image", + "workflows": "Workflows" }