l10n daemon script cb7a3d26c5 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"		2016-07-25 09:52:46 +00:00
..
CMakeLists.txt	Use KAuth to get privileges needed for detecting partitions.	2016-07-22 12:00:01 +01:00
org.kde.kpmcore.scan.actions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-07-25 09:52:46 +00:00
scan.cpp	Use lsblk to detect devices.	2016-07-22 12:56:59 +01:00
scan.h	Use lsblk to detect devices.	2016-07-22 12:56:59 +01:00