l10n daemon script df10c92d48 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"		2021-02-04 06:59:16 +01:00
..
indicator	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-02-04 06:59:16 +01:00
CMakeLists.txt	add Latte/Indicator type and improve metadata	2019-03-29 19:12:32 +02:00