l10n daemon script f5ac506835 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-16 05:37:45 +01:00
..
findmyphone	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-16 05:37:45 +01:00
remotecommands	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-16 05:37:45 +01:00
CMakeLists.txt	Find my phone runner	2019-02-08 23:59:42 +01:00