Commit graph

5 commits

Author SHA1 Message Date
l10n daemon script
4b911fa0bc 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-04-03 02:25:31 +00:00
l10n daemon script
17a86b7882 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-04-02 02:23:08 +00:00
l10n daemon script
7a67f19acb 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-04-01 02:26:14 +00:00
l10n daemon script
44d6ac35c1 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-03-31 02:33:03 +00:00
Devin Lin
fc5b968534 quicksettings: Add docked/convergence quick setting 2023-03-29 19:41:10 -07:00