From b39d3703a88953050f0607600293d75b650ac41d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Jun 2021 01:15:46 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- wallpapers/Next/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 10b38b48..4b2f3fca 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -7,6 +7,7 @@ Name[de]=Altai Name[el]=Altai Name[en_GB]=Altai Name[es]=Altai +Name[eu]=Altai Name[fr]=Altai Name[ia]=Altai Name[it]=Altai