diff options
| author | l10n daemon script <[email protected]> | 2022-05-03 01:50:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-03 01:50:40 +0000 |
| commit | d958aa57d87ba1b391bac8043949f49fb23fb43c (patch) | |
| tree | a8e37ca78a43786af94e38d88d2471ec49803987 /src/dolphindockwidget.cpp | |
| parent | 9b5f56980bc4d2f399a6b828c94b23f3626c9d21 (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