diff options
| author | l10n daemon script <[email protected]> | 2021-08-23 01:28:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-23 01:28:23 +0000 |
| commit | e76bf5cb18ca46a0adc84ead3801726814cf6fd3 (patch) | |
| tree | 53737c03bc7f77280530c85095972d04ca7063e4 /src/dolphincontextmenu.h | |
| parent | 37d415cedceaad5bf8b009d9c91b8a89bd1f139b (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/dolphincontextmenu.h')
0 files changed, 0 insertions, 0 deletions