From db3ac9a536577dc07c35e0c96726e54b0fffa618 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 14 Oct 2015 10:26:47 +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"
---
 backends/hwcomposer/hwcomposer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/hwcomposer/hwcomposer.json b/backends/hwcomposer/hwcomposer.json
index eec46a93e0..2279a2ef73 100644
--- a/backends/hwcomposer/hwcomposer.json
+++ b/backends/hwcomposer/hwcomposer.json
@@ -32,4 +32,4 @@
         "Name[zh_CN]": "hwcomposer"
     }, 
     "input": false
-}
+}
\ No newline at end of file