From 5ea3e44705d16d994aa89010080baa1efceee330 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 Mar 2021 06:41:47 +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" --- plugins/connectivity-report/kdeconnect_connectivity_report.json | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 8d37fc148..6e161bd08 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -1,4 +1,3 @@ - { "KPlugin": { "Authors": [