marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-27 14:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/applets/quicksettings/package
History
l10n daemon script 56cb796dd5 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"
2017-09-05 04:31:55 +02:00
..
contents/ui open settings app 2017-09-04 18:15:49 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-09-05 04:31:55 +02:00