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/initialstart/modules/finished
History
l10n daemon script 433c3a9228 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-08 02:35:17 +00:00
..
contents/ui initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-08 02:35:17 +00:00