shift-shell/kwin/scripts/convergentwindows
l10n daemon script 68b94f31b3 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"
2023-03-21 02:44:34 +00:00
..
contents/code kwin/convergentwindows: fix signal names 2023-03-15 16:06:16 +01:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-21 02:44:34 +00:00