l10n daemon script e112ebe944 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"		2022-03-20 02:14:59 +00:00
..
dummy	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:14:59 +00:00
sfdisk	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:14:59 +00:00
CMakeLists.txt	Simplify code using K_PLUGIN_CLASS_WITH_JSON macro.	2021-12-24 18:58:41 +00:00