From 8fa6313f461e4ac2569293ec7fb39fc3e1303807 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 5 Oct 2016 09:28:16 +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"
---
 kdecoration/breeze.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kdecoration/breeze.json b/kdecoration/breeze.json
index c4cb32b2..f9160f4a 100644
--- a/kdecoration/breeze.json
+++ b/kdecoration/breeze.json
@@ -28,7 +28,6 @@
         "Description[uk]": "Обрамлення вікон з використанням візуального стилю Breeze для стільничного середовища Плазми", 
         "Description[x-test]": "xxWindow decoration using the Breeze visual style for the Plasma Desktopxx", 
         "Description[zh_CN]": "窗口装饰使用等离子桌面微风视觉主题", 
-        "Description[zh_TW]": "Plasma 桌面使用 Breeze 視覺樣式的視窗裝飾", 
         "EnabledByDefault": true, 
         "Id": "org.kde.breeze", 
         "Name": "Breeze",