diff options
| author | l10n daemon script <[email protected]> | 2026-03-04 01:42:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-03-04 01:42:19 +0000 |
| commit | e0a5805b3ee63d83248c6ada71728eac39136909 (patch) | |
| tree | 311788b192980cd3f554811d6c857c2b9c0b20f9 /src/admin | |
| parent | d323471ed84c603c8fa0ea85be7385a26362ed92 (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/admin')
0 files changed, 0 insertions, 0 deletions