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 · 3c1d55886f
parent 0feffd08da
commit 3c1d55886f
2 changed files with 2 additions and 0 deletions
--- a/applets/spacer/metadata.desktop.cmake
+++ b/applets/spacer/metadata.desktop.cmake
@ -50,6 +50,7 @@ Type=Service
 Keywords=spacer
 Keywords[ca]=espaiador
 Keywords[ca@valencia]=espaiador
 Keywords[cs]=oddělovač
 Keywords[da]=afstandsstykke
 Keywords[de]=Abstandshalter
 Keywords[el]=κενό
--- a/applets/spacer/package/metadata.desktop
+++ b/applets/spacer/package/metadata.desktop
@ -50,6 +50,7 @@ Type=Service
 Keywords=spacer
 Keywords[ca]=espaiador
 Keywords[ca@valencia]=espaiador
 Keywords[cs]=oddělovač
 Keywords[da]=afstandsstykke
 Keywords[de]=Abstandshalter
 Keywords[el]=κενό