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"
2017-10-01 05:17:39 +02:00 · 2017-10-01 05:17:39 +02:00 · f0445b20e2
commit f0445b20e2
parent 2fb5a5fb9f
1 changed files with 0 additions and 1 deletions
--- a/plugins/scenes/opengl/opengl.json
+++ b/plugins/scenes/opengl/opengl.json
@ -6,4 +6,3 @@
        "Name": "SceneOpenGL"
    }
 }
-