diff options
| author | l10n daemon script <[email protected]> | 2025-12-13 01:38:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-12-13 01:38:58 +0000 |
| commit | fb9561c457207d5c1661a9ffc7fafdd0710c7ff1 (patch) | |
| tree | d2da670ca53a0d1cca5f274cb4ec4ea1b5cb940c /po/tg | |
| parent | b94943bc840b9863fe87c6bd6faa983e1bfa26f1 (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/tg')
0 files changed, 0 insertions, 0 deletions