From a92fa79cc0ab42de9df39f4284878f38e7a7092e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Dec 2016 04:31:48 +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"
---
 .../packagestructure/containmentactions-packagestructure.json   | 2 +-
 src/plasma/packagestructure/dataengine-packagestructure.json    | 2 +-
 src/plasma/packagestructure/plasmageneric-packagestructure.json | 2 +-
 src/plasma/packagestructure/plasmatheme-packagestructure.json   | 2 +-
 src/plasma/packagestructure/plasmoid-packagestructure.json      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json
index 000d56a4f..3bee53a2f 100644
--- a/src/plasma/packagestructure/containmentactions-packagestructure.json
+++ b/src/plasma/packagestructure/containmentactions-packagestructure.json
@@ -46,4 +46,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
\ No newline at end of file
+}
diff --git a/src/plasma/packagestructure/dataengine-packagestructure.json b/src/plasma/packagestructure/dataengine-packagestructure.json
index c4a1e2a1a..00afc140e 100644
--- a/src/plasma/packagestructure/dataengine-packagestructure.json
+++ b/src/plasma/packagestructure/dataengine-packagestructure.json
@@ -48,4 +48,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
\ No newline at end of file
+}
diff --git a/src/plasma/packagestructure/plasmageneric-packagestructure.json b/src/plasma/packagestructure/plasmageneric-packagestructure.json
index c3b93dd05..91251f82a 100644
--- a/src/plasma/packagestructure/plasmageneric-packagestructure.json
+++ b/src/plasma/packagestructure/plasmageneric-packagestructure.json
@@ -47,4 +47,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
\ No newline at end of file
+}
diff --git a/src/plasma/packagestructure/plasmatheme-packagestructure.json b/src/plasma/packagestructure/plasmatheme-packagestructure.json
index 02ddc8e49..68d6a7f88 100644
--- a/src/plasma/packagestructure/plasmatheme-packagestructure.json
+++ b/src/plasma/packagestructure/plasmatheme-packagestructure.json
@@ -48,4 +48,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
\ No newline at end of file
+}
diff --git a/src/plasma/packagestructure/plasmoid-packagestructure.json b/src/plasma/packagestructure/plasmoid-packagestructure.json
index d62798ab3..9794fd393 100644
--- a/src/plasma/packagestructure/plasmoid-packagestructure.json
+++ b/src/plasma/packagestructure/plasmoid-packagestructure.json
@@ -38,4 +38,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
\ No newline at end of file
+}