l10n daemon script f7743ade92 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"		2020-12-10 06:24:39 +01:00
..
contents/ui	plasma-framework: Convert copyright statements to SPDX expressions	2020-08-13 19:08:54 +00:00
platformcontents/application/tablet/ui	plasma-framework: Convert copyright statements to SPDX expressions	2020-08-13 19:08:54 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-10 06:24:39 +01:00
widgetgallery-tablet	add a bunch of test applets that already work	2013-09-04 11:57:46 +02:00