kwin/examples
l10n daemon script 74ef01dbc0 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-10-30 02:09:50 +00:00
..
quick-effect SVN_SILENT made messages (.desktop file) - always resolve ours 2023-10-30 02:09:50 +00:00