From c172a916273cb9b6b7fd2ef2536d2e17e8b73be2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 8 Jun 2020 05:15:01 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.kde.alligator.desktop b/org.kde.alligator.desktop
index 39935392..b7e37705 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -3,6 +3,7 @@ Name=Alligator
 Name[ca]=Alligator
 Name[ca@valencia]=Alligator
 Name[cs]=Alligator
+Name[es]=Alligator
 Name[et]=Alligator
 Name[fr]=Alligator
 Name[it]=Alligator