diff options
| author | l10n daemon script <[email protected]> | 2021-12-08 01:48:36 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-08 01:48:36 +0000 |
| commit | 1035f182b141c8b6ca287eb4fb1e6c6c47e1d5e9 (patch) | |
| tree | 9dfb8d50101b80e29b50f11c45e69324bf264c17 /src/dolphinviewcontainer.h | |
| parent | 01e2a0446752e8ae7e43043006693086b54d7656 (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