diff options
| author | l10n daemon script <[email protected]> | 2022-05-29 01:46:43 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-29 01:46:43 +0000 |
| commit | 1fc3108f1444df18600bebc8bee11972d164ccf1 (patch) | |
| tree | 52a761c99f691e761559617819e826cae142b595 /src/settings/viewmodes | |
| parent | 734df72e900f500e091a815bf557898b7c302e07 (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')
0 files changed, 0 insertions, 0 deletions