marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-07-30 08:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2025-07-11 01:34:44 +00:00
parent d0b1df97a6
commit 4ed20886c0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/waydroidintegrationplugin/kauth/waydroidhelper.actions
View file

@ -10,4 +10,4 @@ Name=Initialize Waydroid
Description=Allow initialization of Waydroid Description=Allow initialization of Waydroid
Policy=yes Policy=yes
PolicyInactive=yes PolicyInactive=yes
Persistence=session Persistence=session