l10n daemon script 0b1fbde12d 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"		2019-01-09 05:31:18 +01:00
..
CMakeLists.txt	Remote Commands plugin	2016-06-12 20:16:58 +02:00
kdeconnect_remotecommands.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-09 05:31:18 +01:00
remotecommandsplugin.cpp	Enable running commands from app	2018-06-20 08:23:15 +02:00
remotecommandsplugin.h	Enable running commands from app	2018-06-20 08:23:15 +02:00