diff options
| author | l10n daemon script <[email protected]> | 2022-03-29 03:51:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-29 03:51:20 +0000 |
| commit | a8966d230c7bdbca269ddc5b6ec1c71d9c8b2e20 (patch) | |
| tree | 7da40379f702081771386f40cce686d650c88cd3 /src/dolphinpart.cpp | |
| parent | c7531ba749ebe9d3f908057067156daf22a20b7a (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/dolphinpart.cpp')
0 files changed, 0 insertions, 0 deletions