diff options
| author | l10n daemon script <[email protected]> | 2021-12-06 01:44:56 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-06 01:44:56 +0000 |
| commit | 73e919a4f3fc429b76cc9be2e55d6a000df620e1 (patch) | |
| tree | e6996d3d9ac7718d84f54b338200260a8a1dbca0 /src/settings | |
| parent | 6cd5e10f22b584629f62b9b7c1034d57802b7572 (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