l10n daemon script 3dbb47745f 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"		2018-02-08 05:13:52 +01:00
..
contents/code	new logout effect	2017-03-15 17:47:22 +01:00
CMakeLists.txt	new logout effect	2017-03-15 17:47:22 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-08 05:13:52 +01:00