l10n daemon script a51e9de6ca 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"		2024-07-02 01:19:10 +00:00
..
org.kde.plasma.mobile.defaultMobileLayout	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-07-02 01:19:10 +00:00
CMakeLists.txt	layout-templates: Move default panel configuration to layout template package	2024-06-26 00:57:56 +00:00