l10n daemon script 0b39056431 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-26 10:44:10 +00:00
..
CMakeLists.txt	Add KAuth helper to detectFileSystem.	2016-07-25 16:33:49 +01:00
org.kde.kpmcore.scan.actions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-07-26 10:44:10 +00:00
scan.cpp	Add KAuth helper to detectFileSystem.	2016-07-25 16:33:49 +01:00
scan.h	Add KAuth helper to detectFileSystem.	2016-07-25 16:33:49 +01:00