diff options
| author | l10n daemon script <[email protected]> | 2020-09-14 09:58:23 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-14 09:58:23 +0200 |
| commit | 65c2d95a7dca988f0ead00e105b8aad0c57732f7 (patch) | |
| tree | 9955740ef44c454ae65be0a0443a71ea49452c20 /src/dolphinpart_ext.cpp | |
| parent | 214b0172661d9907ac2959f6331b3331f0b827f9 (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_ext.cpp')
0 files changed, 0 insertions, 0 deletions