marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/look-and-feel
History
l10n daemon script c8419144ad 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"
2020-06-18 05:45:52 +02:00
..
contents Add cancel button to the Logout dialog 2020-04-02 15:51:42 +03:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 05:45:52 +02:00