diff options
| author | l10n daemon script <[email protected]> | 2025-07-01 01:33:47 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-01 01:33:47 +0000 |
| commit | a5732d5caa262d092be00f5ec52bb7c2e90a2982 (patch) | |
| tree | cc326d0f3fa6288369ee9ce7cc9e955feef8788f /po/nb | |
| parent | e112fc50e0577449990746e1718b79e54748b61f (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/nb')
0 files changed, 0 insertions, 0 deletions