From 6ff10e44053a8d2b36557e4e2135f10ae34d6941 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 11 Mar 2018 07:13:28 +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"
---
 kwin.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kwin.notifyrc b/kwin.notifyrc
index a8cf9776ab..8899d17294 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -24,7 +24,7 @@ Comment[hi]=केविन विंडो प्रबंधक
 Comment[hr]=Upravitelj prozora KWin
 Comment[hu]=KWin ablakkezelő
 Comment[ia]=Gerente de fenestra KWin
-Comment[id]=Manajer Jendela KWin
+Comment[id]=Pengelola Jendela KWin
 Comment[is]=KWin gluggastjóri
 Comment[it]=Gestore delle finestre KWin
 Comment[ja]=KWin ウィンドウマネージャ