diff options
| author | l10n daemon script <[email protected]> | 2024-07-23 01:21:39 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-23 01:21:39 +0000 |
| commit | dd4f41bc61866d9deaeaed534ba61099f5f65e89 (patch) | |
| tree | 9ca5799429f12c233d646b597f3cc3c85eaf7726 /po/uz@cyrillic | |
| parent | 6e6fcf8da80b5b6821837054ae51eaa19edc24b8 (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