diff options
| author | l10n daemon script <[email protected]> | 2021-12-20 01:45:56 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-20 01:45:56 +0000 |
| commit | b38d7150d99f4aa611e0b103bae2eef7b1d3171e (patch) | |
| tree | 2629f51e256df9ee76d4ba7d225d1aa264968cab /src/main.cpp | |
| parent | 2f62b054eabffb657976f94abd49c6445878b647 (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/main.cpp')
0 files changed, 0 insertions, 0 deletions