diff options
| author | l10n daemon script <[email protected]> | 2024-08-20 01:25:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-20 01:25:27 +0000 |
| commit | 427a430fe427f1173121bf57c11e7d9a0d0bdefa (patch) | |
| tree | 885abed5db798f56a5f6cc6aaec96d23a75a5090 /po/uz@cyrillic | |
| parent | 6bd922b936e048a515ea2992d39e4a3568ecd5bb (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/uz@cyrillic')
0 files changed, 0 insertions, 0 deletions