diff options
| author | l10n daemon script <[email protected]> | 2022-05-07 01:45:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-07 01:45:00 +0000 |
| commit | 2e333e1b9784b2d04b056e9b1a8e6ddb058584fd (patch) | |
| tree | 5c69079f52704ef45620edf7aabd9afd4241ccc1 /src/dolphinrecenttabsmenu.cpp | |
| parent | 2c91112c61a5c32fe278511b119804107ceadcdd (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/dolphinrecenttabsmenu.cpp')
0 files changed, 0 insertions, 0 deletions