l10n daemon script a2a9bb8301 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"		2020-04-04 06:23:31 +02:00
..
dummy	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-04 06:23:31 +02:00
sfdisk	Merge branch 'partition-name' into 'master'	2020-03-28 00:42:09 +00:00
CMakeLists.txt	Remove libparted backend.	2018-03-31 13:14:38 +01:00