diff options
| author | l10n daemon script <[email protected]> | 2021-12-07 01:46:49 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-07 01:46:49 +0000 |
| commit | 01e2a0446752e8ae7e43043006693086b54d7656 (patch) | |
| tree | 56447036930835af3992a45d49366e6eb06f5bf2 /src/dolphinviewcontainer.h | |
| parent | fde79c09cb9ae5991d6b36c7c1d125628f2c7914 (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/dolphinviewcontainer.h')
0 files changed, 0 insertions, 0 deletions