diff options
| author | l10n daemon script <[email protected]> | 2020-09-01 10:13:23 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-01 10:13:23 +0200 |
| commit | 4b438da3cb4699d395565a0d5e71d7f7d77c945d (patch) | |
| tree | bf4b0a515ceb84fd7c365fe2a49dc49363dddb0d /src/dolphinviewcontainer.cpp | |
| parent | d624af1091f78ea234050058b9df1e5c9e1d0592 (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.cpp')
0 files changed, 0 insertions, 0 deletions