From f0445b20e2b6935149f105a1f43c42fb90049dcc Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 1 Oct 2017 05:17:39 +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"
---
 plugins/scenes/opengl/opengl.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json
index e31a6d8e0a..c2d9a7e7cd 100644
--- a/plugins/scenes/opengl/opengl.json
+++ b/plugins/scenes/opengl/opengl.json
@@ -6,4 +6,3 @@
         "Name": "SceneOpenGL"
     }
 }
-