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 f1bce20b3e 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-06-01 01:58:30 +00:00
..
contents logout: Fix window not loading 2022-05-27 10:16:22 -04:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-06-01 01:58:30 +00:00