l10n daemon script 9fb99bffbc 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-25 01:20:43 +00:00
..
org.kde.plasma.mobile.defaultNavigationPanel	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-07-25 01:20:43 +00:00
org.kde.plasma.mobile.defaultStatusBar	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-07-25 01:20:43 +00:00
CMakeLists.txt	layout-templates: Split out status bar and navigation panel to separate templates	2024-07-15 17:07:26 -04:00