diff options
| author | l10n daemon script <[email protected]> | 2025-06-12 01:33:48 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-12 01:33:48 +0000 |
| commit | d4e8b06b0ff824e3e3bb3a397b9379eee1bea929 (patch) | |
| tree | b1716b729f1b1143382038f47b2bcdff4b8eef60 /src/dolphindockwidget.cpp | |
| parent | 5a6168fec145064c14d6e95c6626a28bd481df43 (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