diff options
| author | l10n daemon script <[email protected]> | 2025-05-27 01:32:44 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-27 01:32:44 +0000 |
| commit | 265a1495a27e4ee4b36357a1eae7ca2b17f7976a (patch) | |
| tree | 298e4da8a8f2e9b11f54ca3bb7e467418d6fbb89 /src/settings | |
| parent | 5539632e2a442eaf497b0ea6265ed1abac888821 (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 'src/settings')
0 files changed, 0 insertions, 0 deletions