diff options
| author | l10n daemon script <[email protected]> | 2022-02-18 01:51:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-02-18 01:51:42 +0000 |
| commit | 78753ad23c3540f9e470bab03630e25c22dd2d3c (patch) | |
| tree | 1c71e93fe0d61a849f753dccee9fec08351fb423 /src/dolphinnavigatorswidgetaction.cpp | |
| parent | b6e47b47508ac6c699c2a841175912ea2a2d9d2b (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/dolphinnavigatorswidgetaction.cpp')
0 files changed, 0 insertions, 0 deletions