shift-shell/shell
l10n daemon script 851ba48346 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"
2021-12-24 01:42:40 +00:00
..
contents REUSE compliance, add check to CI, drop unused components 2021-12-23 16:02:41 +00:00
Messages.sh REUSE compliance, add check to CI, drop unused components 2021-12-23 16:02:41 +00:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-12-24 01:42:40 +00:00