l10n daemon script 4c32c38655 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-07-08 01:22:49 +00:00
..
dummy	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-08 01:22:49 +00:00
sfdisk	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-08 01:22:49 +00:00
CMakeLists.txt	SPDX licenses for tests and CMakeLists.txt.	2020-09-17 02:15:16 +01:00