marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-28 22:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/look-and-feel
History
l10n daemon script 78ce668071 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"
2019-11-20 05:40:05 +01:00
..
contents Rewrite the lockscreen 2019-10-31 06:20:36 +00:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-20 05:40:05 +01:00