l10n daemon script c2bc7d4d04 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-02-10 07:31:10 +01:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-10 07:31:10 +01:00
CMakeLists.txt