l10n daemon script fd7a7bd947 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"		2015-06-07 04:13:54 +00:00
..
dummy	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-07 04:13:54 +00:00
libparted	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-07 04:13:54 +00:00
CMakeLists.txt	Move kpmcore library into its own repository.	2015-06-04 01:29:22 +01:00
pmcorebackendplugin.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-07 04:13:54 +00:00