From c4a8881da13f796cd6af38b84f95bde480b49a27 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 8 Jan 2018 04:45:26 +0100
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"
---
 app/latte-layouts.knsrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc
index f83d40b6a..13495595e 100644
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@@ -2,6 +2,7 @@
 Name=Latte Layouts
 Name[ca]=Disposicions del Latte
 Name[ca@valencia]=Disposicions del Latte
+Name[de]=Latte-Profile
 Name[nl]=Latte-indelingen
 Name[pl]=Układy Latte
 Name[pt]=Disposições do Latte