marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/containments/homescreen/package
History
l10n daemon script 006cb7f865 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"
2021-02-18 07:54:49 +01:00
..
contents respect max favorite count when dropping 2021-02-16 13:37:50 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-02-18 07:54:49 +01:00