diff options
| author | l10n daemon script <[email protected]> | 2023-11-26 02:33:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-26 02:33:09 +0000 |
| commit | e5387d148140d2b5c6569fee0c0e8935cf9a0144 (patch) | |
| tree | 7596d181cec0153d51c11e168e44ddbb76798220 /src/dolphinpart.cpp | |
| parent | 787fa3eebdeeb2707a78d9e72a082f89c2e05bb2 (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