shift-shell/shell
l10n daemon script 6341f6619c 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"
2023-10-22 02:34:49 +00:00
..
contents taskpanel: Fix rotation position 2023-10-16 22:12:44 -07:00
Messages.sh REUSE compliance, add check to CI, drop unused components 2021-12-23 16:02:41 +00:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-10-22 02:34:49 +00:00
metadata.json.license shell: Convert desktop file to JSON 2022-07-21 19:30:11 +00:00