l10n daemon script 8349588c77 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-04-06 09:54:12 +00:00
..
contents/ui	Fix how the plasmoid status is specified	2015-03-13 00:56:25 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-06 09:54:12 +00:00