diff options
| author | l10n daemon script <[email protected]> | 2026-01-17 01:39:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-01-17 01:39:38 +0000 |
| commit | 137097be34a041d457624939e4d9eea25ed58f14 (patch) | |
| tree | f5dd197f84726574a9f5ba911588fe48687f2156 /po/or | |
| parent | d501d5b6ff7875e763aac7688dca6e4da59e4130 (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 'po/or')
0 files changed, 0 insertions, 0 deletions