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"
5 years ago · bcf1a78761
parent a6525f488e
commit bcf1a78761
1 changed files with 1 additions and 1 deletions
--- a/kcms/colors/colorschemes.knsrc
+++ b/kcms/colors/colorschemes.knsrc
@ -1,6 +1,6 @@
 [KNewStuff3]
 Name=Color Schemes
-Name[az]=Rən Sxemləri
+Name[az]=Rəng Sxemləri
 Name[ca]=Esquemes de color
 Name[cs]=Barevná schémata
 Name[da]=Farvetemaer