l10n daemon script 465aec251d 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-08-01 09:52:41 +00:00
..
CMakeLists.txt	Revert "Add KAuth helper to detectFileSystem."	2016-07-29 18:15:28 +01:00
org.kde.kpmcore.scan.actions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-01 09:52:41 +00:00
scan.cpp	Revert "Add KAuth helper to detectFileSystem."	2016-07-29 18:15:28 +01:00
scan.h	Revert "Add KAuth helper to detectFileSystem."	2016-07-29 18:15:28 +01:00