diff options
| author | l10n daemon script <[email protected]> | 2024-07-09 01:19:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-09 01:19:12 +0000 |
| commit | 22de178ad6001451eaa7e0cbf46801a18b027695 (patch) | |
| tree | 9cce95b4bf2795e1b30e68b3c0a388e3fbedf073 /po/be@latin | |
| parent | 0d981e7b7df266c867004e23a169ba8cc13c8683 (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