diff options
| author | l10n daemon script <[email protected]> | 2026-02-06 01:41:48 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-06 01:41:48 +0000 |
| commit | 0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 (patch) | |
| tree | a34fad31fa1d73deeba55924ec03c5f93c868d75 /src/tests | |
| parent | f2cedf6a093983911d4da7488fd3f574a189c1fc (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