kdeconnect-kde/plasmoid
l10n daemon script 4a6babecba 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-08-12 01:20:40 +00:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2024-08-12 01:20:40 +00:00
CMakeLists.txt Remove KF5 plasmoid 2023-12-23 16:34:33 +00:00
Messages.sh Remove KF5 plasmoid 2023-12-23 16:34:33 +00:00