diff options
| author | l10n daemon script <[email protected]> | 2026-02-13 01:41:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-13 01:41:32 +0000 |
| commit | 8d74542b11d1c4afc7f61707be34b2794ad0ffed (patch) | |
| tree | 2482f842fe00a812ba9373a5addaf885f52f49da /po/kn | |
| parent | bf94fe656c691908928cf59c1ff526fe5afc611e (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/kn')
0 files changed, 0 insertions, 0 deletions