l10n daemon script d33800a748 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"		2015-09-17 11:59:25 +00:00
..
contents/ui	Add button to find phone from plasmoid	2015-09-11 22:48:45 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-09-17 11:59:25 +00:00