diff options
| author | l10n daemon script <[email protected]> | 2024-05-25 01:19:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-05-25 01:19:17 +0000 |
| commit | 3fad514921f528145d4af3f921afaf3d1908a3cf (patch) | |
| tree | 9a878947d65fae381e850078b110af694efaf9fb /src/tests | |
| parent | efff6a57087754b76864721d27529b1aae63915c (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 'src/tests')
0 files changed, 0 insertions, 0 deletions