Files
konsole/src/plugins
l10n daemon script 2433851cc3 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"
2024-06-06 01:19:48 +00:00
..
2024-05-13 06:53:34 +02:00
2022-02-06 11:54:22 +08:00