From aa0a25f380b13d2846358d4b7f83175fe99da7ab Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 31 Oct 2017 04:42:16 +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 5e936b52b3..a8cf9776ab 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -252,7 +252,7 @@ Comment[et]=Toimus graafika lähtestamise sündmus
 Comment[eu]=Grafikoak berrezartzeko gertaera bat jazo da
 Comment[fi]=Sattui grafiikan nollaustapahtuma
 Comment[fr]=Un évènement de réinitialisation graphique est intervenu
-Comment[gl]=Aconteceu un reinicio de gráficos
+Comment[gl]=Aconteceu un evento de reinicio de gráficos
 Comment[he]=הגרפיקה אופסה
 Comment[hu]=Egy grafikai visszaállítás esemény történt
 Comment[ia]=Il necessita un evento de reinitiar le graphic