From e65f7a349f057da047c5b100dfed729cb326fa3a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 18 Jan 2016 14:17:07 +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/x11/x11.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends/x11/x11.json b/backends/x11/x11.json
index 413ea7facb..ca4569053a 100644
--- a/backends/x11/x11.json
+++ b/backends/x11/x11.json
@@ -28,6 +28,7 @@
         "Name": "x11", 
         "Name[ca@valencia]": "X11", 
         "Name[ca]": "X11", 
+        "Name[de]": "X11", 
         "Name[pt]": "X11", 
         "Name[sr@ijekavian]": "Икс11", 
         "Name[sr@ijekavianlatin]": "X11",