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 a7a5a3f003 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-12-04 05:36:25 +01:00
..
contents put LayoutManager.js in the proper place 2019-12-03 11:07:56 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-04 05:36:25 +01:00