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/panel/package
History
l10n daemon script 8e3a03beb4 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"
2019-11-16 05:03:41 +01:00
..
contents remove useless debug 2019-10-22 13:38:07 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-16 05:03:41 +01:00