shift-shell/look-and-feel
l10n daemon script 006cb7f865 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-02-18 07:54:49 +01:00
..
contents Add lockscreen notification animations, and delegate recycler 2020-12-23 22:09:54 -05:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-02-18 07:54:49 +01:00