kdeconnect-kde/plasmoid
l10n daemon script d9ba7d78ad 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-04-29 02:56:02 +00:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2024-04-29 02:56:02 +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