diff options
| author | l10n daemon script <[email protected]> | 2022-03-20 03:39:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-20 03:39:12 +0000 |
| commit | 109eb3334d14a39cb5c87897042a57b9da255cfe (patch) | |
| tree | 9775bead193d7bfd49bfe66328014e78f8eafa27 /src/dolphinviewcontainer.cpp | |
| parent | 3c1ebfcfb19afc2a4f5f9ebe0e67689cef0253c1 (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