From 0aa9cb1f7ac7bf42c4a9a26315d69e99f37813b1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Mar 2019 05:50:43 +0100 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" --- effects/squash/package/metadata.desktop | 1 - 1 file changed, 1 deletion(-) diff --git a/effects/squash/package/metadata.desktop b/effects/squash/package/metadata.desktop index 7b3ab09d80..179d4405d9 100644 --- a/effects/squash/package/metadata.desktop +++ b/effects/squash/package/metadata.desktop @@ -38,7 +38,6 @@ Name[pl]=Ściskanie Name[pt]=Esmagar Name[pt_BR]=Achatar Name[ru]=Сжатие -Name[sk]=Rozpučiť Name[sv]=Kläm Name[uk]=Складування Name[x-test]=xxSquashxx