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"
This commit is contained in:
l10n daemon script 2021-05-14 01:15:32 +00:00
parent 87909c2c81
commit f941019a16
1 changed files with 1 additions and 0 deletions

View File

@ -2,6 +2,7 @@
Name=Kasts
Name[ca]=Kasts
Name[ca@valencia]=Kasts
Name[cs]=Kasts
Name[de]=Kasts
Name[es]=Kasts
Name[nl]=Kasts