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"
4 years ago · df10c92d48
parent 4be537d24d
commit df10c92d48
1 changed files with 1 additions and 1 deletions
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Indicator
-Name[az]=İndikaator
+Name[az]=İndikator
 Name[ca]=Indicador
 Name[ca@valencia]=Indicador
 Name[cs]=Ukazatel