From f2948904eb867c5b539f875c184106ec78cc86c3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 13 Jul 2020 05:37:57 +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"
---
 org.kde.alligator.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.kde.alligator.desktop b/org.kde.alligator.desktop
index 19ab909f..8e0a0e73 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -19,7 +19,7 @@ Name[uk]=Alligator
 Name[x-test]=xxAlligatorxx
 Comment=Mobile Feed Reader
 Comment[ca]=Lector de fonts per al mòbil
-Comment[ca@valencia]=Lector de fonts per a mòbil
+Comment[ca@valencia]=Lector de fonts per al mòbil
 Comment[cs]=Mobilní čtečka kanálů
 Comment[et]=Mobiili uudistelugeja
 Comment[fr]=Lecteur nomade de fils d'actualité