From 4028e7e4c78814e204fb4a9cf2eb9b68b87ce2fb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 10 Oct 2017 04:56:34 +0200
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"
---
 kstyle/config/breezestyleconfig.desktop | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop
index e4add0ca..5a1c67be 100644
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@@ -17,18 +17,12 @@ Name[el]=Στιλ γραφικών συστατικών Breeze
 Name[es]=Estilo de elementos gráficos Brisa
 Name[eu]=Breeze trepeten estiloa
 Name[fr]=Style de composant graphique Brise
-<<<<<<< HEAD
 Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget) de Breeze
-=======
->>>>>>> Plasma/5.11
 Name[it]=Stile degli oggetti di Brezza
 Name[nl]=Breeze widgetstijl
 Name[pl]=Wygląd interfejsu Bryzy
 Name[pt]=Estilo Gráfico Brisa
-<<<<<<< HEAD
 Name[pt_BR]=Estilo dos widgets Breeze
-=======
->>>>>>> Plasma/5.11
 Name[ru]=Стиль интерфейса Breeze
 Name[sr]=Поветарчев стил виџета̂
 Name[sr@ijekavian]=Поветарчев стил виџета̂
@@ -37,7 +31,13 @@ Name[sr@latin]=Povetarčev stil vidžetâ̂
 Name[sv]=Breeze stil för grafiska komponenter
 Name[uk]=Стиль віджетів Breeze
 Name[x-test]=xxBreeze Widget Stylexx
-Name[zh_CN]=微风部件样式
+Name[zh_CN]=微风小部件样式
+<<<<<<< HEAD
+=======
+>>>>>>> Plasma/5.11
+<<<<<<< HEAD
+=======
+>>>>>>> Plasma/5.11
 Comment=Modify the appearance of widgets
 Comment[ar]=عدّل مظهر الودجات
 Comment[ca]=Modifica l'aparença dels estris