diff options
| author | l10n daemon script <[email protected]> | 2025-10-05 01:30:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-10-05 01:30:38 +0000 |
| commit | 1cfe9f9ad3569be01da2e4a8877017c03ac484cf (patch) | |
| tree | 9401e7c667fa30dd7922c95453cba3f5be237426 /po/ca | |
| parent | f9db28431445a4b08c37dc5067a3f1c51c0c08dd (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