mirror-kde-plasma-desktop/toolboxes
l10n daemon script e0fecd5b2d 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"
2024-09-20 01:27:00 +00:00
..
paneltoolbox SVN_SILENT made messages (.desktop file) - always resolve ours 2024-09-20 01:27:00 +00:00
CMakeLists.txt Zoom out when going in edit mode 2024-05-20 14:40:17 +00:00
plasma-toolbox-paneltoolbox.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2024-09-12 01:21:58 +00:00