l10n daemon script 4448caacaa 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"		2017-01-05 05:58:54 +01:00
..
contents/ui	remove the fake notifications	2015-08-05 17:09:17 +02:00
Messages.sh	add notifications and clock applets placeholders	2015-03-05 17:17:27 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-05 05:58:54 +01:00