l10n daemon script 8d980b56ed 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-12-19 05:44:22 +01:00
..
dummy	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-12-19 05:44:22 +01:00
sfdisk	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-12-19 05:44:22 +01:00
CMakeLists.txt	Remove libparted backend.	2018-03-31 13:14:38 +01:00