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"
7 years ago · cfec678f68
parent b7a1bbfdfc
commit cfec678f68
3 changed files with 0 additions and 3 deletions
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=Latte
-Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -1,7 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte
-Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -1,7 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte
-Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte