From f4504f476463baac41ee3c5acd151e84126bb970 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 25 Sep 2017 04:51:51 +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"
---
 generators/markdown/libokularGenerator_md.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generators/markdown/libokularGenerator_md.json b/generators/markdown/libokularGenerator_md.json
index d4b29d2e8..bfb1f81e9 100644
--- a/generators/markdown/libokularGenerator_md.json
+++ b/generators/markdown/libokularGenerator_md.json
@@ -28,6 +28,7 @@
         "Name[ca@valencia]": "Dorsal de Markdown",
         "Name[ca]": "Dorsal de Markdown",
         "Name[cs]": "Podpůrná vrstva Markdown",
+        "Name[de]": "Anzeigemodul für Markdown",
         "Name[el]": "Σύστημα υποστήριξης markdown",
         "Name[es]": "Motor para Markdown",
         "Name[fr]": "Moteur de markdown",