From d711de9ec044fd01ac10f6c8121b6818523d99b9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 20 Apr 2016 09:37:14 +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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kdecoration/breeze.json b/kdecoration/breeze.json
index eca76089..9c78f95a 100644
--- a/kdecoration/breeze.json
+++ b/kdecoration/breeze.json
@@ -1,9 +1,9 @@
 {
     "KPlugin": {
-        "Name": "Breeze",
-        "Description": "Window decoration using the Breeze visual style for the Plasma Desktop",
+        "Description": "Window decoration using the Breeze visual style for the Plasma Desktop", 
         "EnabledByDefault": true, 
         "Id": "org.kde.breeze", 
+        "Name": "Breeze", 
         "ServiceTypes": [
             "org.kde.kdecoration2"
         ]
@@ -12,4 +12,4 @@
         "blur": false, 
         "kcmodule": true
     }
-}
+}
\ No newline at end of file