diff options
| author | l10n daemon script <[email protected]> | 2022-03-05 01:48:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-05 01:48:28 +0000 |
| commit | 3366f62b0979752249a7e38769c318c72100aac6 (patch) | |
| tree | d037bdc8305f8eaf3b175248236860ad842eb1cf /src/settings/viewmodes/viewmodesettings.cpp | |
| parent | 62f1897e592bbc0976e178ed07fc4faa5451a0cd (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/viewmodes/viewmodesettings.cpp')
0 files changed, 0 insertions, 0 deletions