Commit graph

3 commits

Author SHA1 Message Date
l10n daemon script
ee113b8cdc 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"
2022-02-14 01:43:34 +00:00
l10n daemon script
3cb0a38040 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"
2022-02-13 01:42:21 +00:00
Devin Lin
fc99809143 quicksettings: Add power menu quicksetting 2022-02-11 00:20:47 -05:00