diff options
| author | l10n daemon script <[email protected]> | 2024-12-14 01:47:37 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-12-14 01:47:37 +0000 |
| commit | 517cc98e1574fdff4944f256d14ff10543b7c718 (patch) | |
| tree | 224448128f592008e0fbbebf42760f4e3c7a354c /src/dolphindockwidget.cpp | |
| parent | 81062df1158e62b7ed65fd81ef55a190637c4c8a (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