diff options
| author | l10n daemon script <[email protected]> | 2025-05-28 01:34:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-28 01:34:23 +0000 |
| commit | 0959642be297bf0749467c204e511f5887b17ee1 (patch) | |
| tree | 8860ef148a5f911f9f9d780c6f17ac61efed45d9 /src/views | |
| parent | 265a1495a27e4ee4b36357a1eae7ca2b17f7976a (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/views')
0 files changed, 0 insertions, 0 deletions