kdeconnect-kde/plugins/remotesystemvolume
l10n daemon script 3d670f3b33 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"
2020-11-29 06:09:21 +01:00
..
CMakeLists.txt Use ecm_qt_declare_logging_category to declare the logging categories 2020-05-26 18:55:47 +02:00
kdeconnect_remotesystemvolume.json SVN_SILENT made messages (.desktop file) - always resolve ours 2020-11-29 06:09:21 +01:00
remotesystemvolumeplugin.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
remotesystemvolumeplugin.h Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00