Commit graph

4 commits

Author SHA1 Message Date
l10n daemon script
48899f6e97 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-21 01:51:37 +00:00
l10n daemon script
27297c445a 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-20 01:48:09 +00:00
l10n daemon script
bf6b44c357 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-19 01:44:51 +00:00
Devin Lin
f8a7c1e4e3 quicksettings: Add vkbd toggle quicksetting 2022-02-16 21:14:54 -05:00