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