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-07-27 01:26:02 +00:00
parent 622d96d50a
commit 66411f24e6

View file

@ -12,6 +12,7 @@ Name[pt_BR]=Cor noturna
Name[sv]=Nattfärg
Name[uk]=Нічні кольори
Name[x-test]=xxNight Colorxx
Name[zh_CN]=
Icon=redshift-status-on
Type=Service