diff options
| author | l10n daemon script <[email protected]> | 2025-05-25 01:35:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-25 01:35:00 +0000 |
| commit | 2ad8b3a51c5035e33fcd4c997a4b4de463dfa25d (patch) | |
| tree | b56999cb454d6a431898b62a380e257e90e4e321 /po/ca@valencia/dolphin.po | |
| parent | b987c93d100e36f649874b7ced13840c7b06f1ed (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@valencia/dolphin.po')
0 files changed, 0 insertions, 0 deletions