diff options
| author | l10n daemon script <[email protected]> | 2026-02-12 01:41:25 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-12 01:41:25 +0000 |
| commit | d8461fc02ed4eac062840f0dbd3eee9fe3047101 (patch) | |
| tree | e53c912a2384d2eb1a8fb7042b9add73012b669a /src/admin | |
| parent | ba2ec163dde22663b6c954324c02d3e43f3d8d90 (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