diff options
| author | l10n daemon script <[email protected]> | 2025-06-14 01:34:10 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-14 01:34:10 +0000 |
| commit | bd839796f1e165016f8a4dfd01b222b31fb7773f (patch) | |
| tree | 16ccfd510f6477693d6b2470cfdeaa46d59de5c4 /LICENSES | |
| parent | 82c859a0863dc861011d4c362580888b5d6add33 (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 'LICENSES')
0 files changed, 0 insertions, 0 deletions