diff options
| author | l10n daemon script <[email protected]> | 2022-07-09 01:52:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-09 01:52:00 +0000 |
| commit | b1eb12e03ac0206c463c95b207209f5e181f3d71 (patch) | |
| tree | 9a9946040e03799b61176dc0a8b744a42cc3b051 /src/dolphintabwidget.cpp | |
| parent | d4476fab9fe4fc3c252d18b5244572310f57cc38 (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/dolphintabwidget.cpp')
0 files changed, 0 insertions, 0 deletions