From c59011af43f20d90190e6e5fd5fdc798034eee08 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 30 Nov 2016 04:32:21 +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"
---
 plugins/platforms/drm/drm.json               | 2 +-
 plugins/platforms/fbdev/fbdev.json           | 2 +-
 plugins/platforms/hwcomposer/hwcomposer.json | 2 +-
 plugins/platforms/virtual/virtual.json       | 2 +-
 plugins/platforms/wayland/wayland.json       | 2 +-
 plugins/platforms/x11/standalone/x11.json    | 2 +-
 plugins/platforms/x11/windowed/x11.json      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json
index 4e977602f9..cd75cb94da 100644
--- a/plugins/platforms/drm/drm.json
+++ b/plugins/platforms/drm/drm.json
@@ -44,4 +44,4 @@
         "Name[x-test]": "xxdrmxx"
     }, 
     "input": false
-}
+}
\ No newline at end of file
diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json
index ce5abc468b..1165b619aa 100644
--- a/plugins/platforms/fbdev/fbdev.json
+++ b/plugins/platforms/fbdev/fbdev.json
@@ -48,4 +48,4 @@
         "Name[x-test]": "xxframebufferxx"
     }, 
     "input": false
-}
+}
\ No newline at end of file
diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json
index 22e284cb0e..445940533c 100644
--- a/plugins/platforms/hwcomposer/hwcomposer.json
+++ b/plugins/platforms/hwcomposer/hwcomposer.json
@@ -40,4 +40,4 @@
         "Name[x-test]": "xxhwcomposerxx"
     }, 
     "input": false
-}
+}
\ No newline at end of file
diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json
index 7589c8f468..d55b5af49a 100644
--- a/plugins/platforms/virtual/virtual.json
+++ b/plugins/platforms/virtual/virtual.json
@@ -50,4 +50,4 @@
         "Name[zh_TW]": "虛擬"
     }, 
     "input": true
-}
+}
\ No newline at end of file
diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json
index 656dee2250..b927cceb60 100644
--- a/plugins/platforms/wayland/wayland.json
+++ b/plugins/platforms/wayland/wayland.json
@@ -42,4 +42,4 @@
         "Name[x-test]": "xxwaylandxx"
     }, 
     "input": true
-}
+}
\ No newline at end of file
diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json
index c5de0da90e..61bddb023d 100644
--- a/plugins/platforms/x11/standalone/x11.json
+++ b/plugins/platforms/x11/standalone/x11.json
@@ -50,4 +50,4 @@
         "Name[x-test]": "xxx11-standalonexx"
     }, 
     "input": true
-}
+}
\ No newline at end of file
diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json
index fbaa5fdb17..a26285f3cf 100644
--- a/plugins/platforms/x11/windowed/x11.json
+++ b/plugins/platforms/x11/windowed/x11.json
@@ -44,4 +44,4 @@
         "Name[x-test]": "xxx11xx"
     }, 
     "input": true
-}
+}
\ No newline at end of file