diff options
| author | l10n daemon script <[email protected]> | 2025-09-27 01:35:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-27 01:35:28 +0000 |
| commit | 552382a82f0e4ad923fd6dd019200c6a25e84686 (patch) | |
| tree | 8dbe34ec1a1f18ec41ad173b4c4891ddd5b7e0a4 /po/ca | |
| parent | 4b7d49dfca757e28a659bd01614b8f3ee3a03fc0 (diff) | |
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"
Diffstat (limited to 'po/ca')
0 files changed, 0 insertions, 0 deletions