l10n daemon script 2fcc37dfb6 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-12-20 12:47:43 +01:00
..
dummy	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:47:43 +01:00
libparted	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:47:43 +01:00
CMakeLists.txt	Consistently use spaces instead of tabs in CMakeLists.txt files.	2015-07-02 15:21:46 +02:00
pmcorebackendplugin.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:47:43 +01:00