l10n daemon script c62650394f 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-05-31 05:14:47 +02:00
..
contents/ui	[kcmkwin/kwindecoration] Refine drag-and-drop button UI	2019-05-02 17:07:22 -06:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-31 05:14:47 +02:00