l10n daemon script 3d0acf15a5 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-06-27 05:13:07 +02:00
..
contents/ui	Make more of the device name/battery show up in the plasmoid	2019-06-25 16:40:10 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-27 05:13:07 +02:00