diff options
| author | l10n daemon script <[email protected]> | 2024-06-22 01:22:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-22 01:22:28 +0000 |
| commit | af7e37139d32e562308975a46f28cab0e40965df (patch) | |
| tree | fb0e298c49d053e0fc457007bb03c62423f96e63 /doc | |
| parent | 6af359f2c7edbbcc33526f3490ce04ccebfc0e3a (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 'doc')
0 files changed, 0 insertions, 0 deletions