diff options
| author | l10n daemon script <[email protected]> | 2022-11-06 01:51:33 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-11-06 01:51:33 +0000 |
| commit | 4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a (patch) | |
| tree | 6cc95efdd867c960936267a1c723349a3a3d138a /src/global.cpp | |
| parent | 5ef1136ea3362a6722b6f4da020d44513f690b31 (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/global.cpp')
0 files changed, 0 insertions, 0 deletions