Files
konsole/desktop
l10n daemon script 720f5aa10b 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-11-04 01:35:56 +00:00
..
2024-07-01 23:29:08 +00:00
2023-01-27 18:07:35 +02:00
2024-07-28 13:09:29 -04:00