From 2157c0d4552f6cc586a1120eac5903c4ee29b0e7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jun 2022 02:36:06 +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" --- app/org.kde.latte-dock.desktop.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake index 999830aa1..621794dee 100644 --- a/app/org.kde.latte-dock.desktop.cmake +++ b/app/org.kde.latte-dock.desktop.cmake @@ -73,7 +73,7 @@ GenericName=Dock GenericName[ar]=مرسى GenericName[az]=Dok GenericName[ca]=Acobla -GenericName[ca@valencia]=Acopla +GenericName[ca@valencia]=Acobla GenericName[cs]=Dok GenericName[da]=Dok GenericName[de]=Dock