diff options
| author | l10n daemon script <[email protected]> | 2024-10-29 01:24:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-10-29 01:24:40 +0000 |
| commit | 99c3c8be59bf1828ab1b9e8827a7c82baddc7501 (patch) | |
| tree | 0154f9181401134db6e8f7e06d80b7ba86eefa26 /po/be@latin | |
| parent | 52da2dc809cde43d2ada7b76e014dd4fee5b62c3 (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/be@latin')
0 files changed, 0 insertions, 0 deletions