diff options
| author | l10n daemon script <[email protected]> | 2025-06-02 01:32:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-02 01:32:45 +0000 |
| commit | 57615e7ba2c7702321684c56fa2a86d65b7eee4b (patch) | |
| tree | a34cdb92af9c1442743694cc3b976d7328305e69 /src/dolphindockwidget.cpp | |
| parent | 149c043c59f0b99d13919bfec4f86baaded3cf16 (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/dolphindockwidget.cpp')
0 files changed, 0 insertions, 0 deletions