marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/look-and-feel
History
l10n daemon script 7391459e8f 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"
2016-10-15 10:01:47 +00:00
..
contents fix lockscreen 2016-02-25 15:07:23 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-10-15 10:01:47 +00:00