diff options
| author | l10n daemon script <[email protected]> | 2022-04-30 01:42:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-30 01:42:27 +0000 |
| commit | 1a8be1544d791e098256cfa5e2ab045e44d42320 (patch) | |
| tree | df033505a9ca98413b82b61241c48de7822760c8 /src/main.cpp | |
| parent | 776d746c6795b19dd5e21390654a69bce3c4dc3f (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