kdeconnect-kde/runners/findmyphone
l10n daemon script 9d3fe2cba0 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-02-10 05:23:38 +01:00
..
CMakeLists.txt Find my phone runner 2019-02-08 23:59:42 +01:00
findmyphonerunner.cpp Find my phone runner 2019-02-08 23:59:42 +01:00
findmyphonerunner.h Find my phone runner 2019-02-08 23:59:42 +01:00
Messages.sh Find my phone runner 2019-02-08 23:59:42 +01:00
plasma-runner-kdeconnect-findmyphone.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-02-10 05:23:38 +01:00