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/containments/taskpanel/package
History
l10n daemon script cc7fac30e8 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-03-11 02:59:39 +00:00
..
contents/ui Fix accidental commenting 2023-03-02 22:11:51 -08:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-11 02:59:39 +00:00