shift-shell/quicksettings/waydroid
l10n daemon script a1ea58567d 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"
2025-07-15 01:36:34 +00:00
..
contents/ui quicksettings: Add quicksettings for Waydroid 2025-07-12 15:08:51 +02:00
Messages.sh quicksettings: Add quicksettings for Waydroid 2025-07-12 15:08:51 +02:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2025-07-15 01:36:34 +00:00