diff options
| author | l10n daemon script <[email protected]> | 2025-12-14 01:36:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-12-14 01:36:01 +0000 |
| commit | 0f90a2855896a25cb773870817d05c0ee0842f6e (patch) | |
| tree | 334f63f6497e9d1ffc2ba3bb24b1d3b71a984ea6 /po/ka | |
| parent | 8f1c3eefcde78f54985687fbf73b909379360c38 (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/ka')
0 files changed, 0 insertions, 0 deletions