l10n daemon script 7c13492f2a 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"		2016-11-29 04:25:11 +01:00
..
contents/ui	Add basic plasmoid as example for developerguide	2015-12-03 02:45:04 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-29 04:25:11 +01:00