From d22a837edd132b29535810c01aacfcc1a004c10a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 9 Sep 2025 02:12:34 +0000
Subject: 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"
---
 src/itemactions/movetonewfolderitemaction.json | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/itemactions/movetonewfolderitemaction.json')

diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index aa6251d6c..3b995afa8 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -45,7 +45,6 @@
         "Name[ta]": "புதிய அடைவிற்கு நகர்த்து",
         "Name[tr]": "Yeni Klasöre Taşı",
         "Name[uk]": "Пересунути до нової теки",
-        "Name[x-test]": "xxMove to New Folderxx",
         "Name[zh_CN]": "移动到新建文件夹",
         "Name[zh_TW]": "移動到新資料夾"
     },
-- 
cgit v1.3.1