l10n daemon script e57d0b19e8 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"		2026-02-16 01:43:18 +00:00
..
CMakeLists.txt	kcm: Implement minimal Waydroid support	2025-07-10 12:00:41 -04:00
waydroidhelper.actions	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-02-16 01:43:18 +00:00
waydroidhelper.cpp	waydroid: Implement reset action	2025-08-02 11:34:17 +02:00