l10n daemon script 79a6f5a192 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-07-15 05:17:11 +02:00
..
dummy	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-15 05:17:11 +02:00
libparted	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-15 05:17:11 +02:00
sfdisk	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-15 05:17:11 +02:00
CMakeLists.txt	Finish porting to KCoreAddons JSON plugins.	2018-03-02 11:33:46 +00:00