kdeconnect-kde/plugins/remotesystemvolume
l10n daemon script 590afee817 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"
2018-12-03 05:29:48 +01:00
..
CMakeLists.txt [app] Add system volume control 2018-11-08 00:43:12 +01:00
kdeconnect_remotesystemvolume.json SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-03 05:29:48 +01:00
remotesystemvolumeplugin.cpp [app] Add system volume control 2018-11-08 00:43:12 +01:00
remotesystemvolumeplugin.h [app] Add system volume control 2018-11-08 00:43:12 +01:00