diff options
| author | l10n daemon script <[email protected]> | 2022-07-13 01:48:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-13 01:48:42 +0000 |
| commit | 8a721c35fcd6393cbda17290ab7dd6891487de44 (patch) | |
| tree | cdf5120ea644a630cb04c7e62a37fb8342c1203f /src/dolphinpart.cpp | |
| parent | ecc5279f8dce498c9b5745be6953f48af664c5cb (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