diff options
| author | l10n daemon script <[email protected]> | 2022-05-15 01:59:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-15 01:59:30 +0000 |
| commit | 2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d (patch) | |
| tree | 20e951aa8bab3ab154e47f2da7b8786c3341aba0 /src/dolphinpart.cpp | |
| parent | 0fc218fd264adf0f67396409cdd1d44265c71f07 (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