diff options
| author | l10n daemon script <[email protected]> | 2022-06-06 01:43:37 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-06 01:43:37 +0000 |
| commit | 579b38050d0ac86a23465bbaba796e1c9bb25619 (patch) | |
| tree | 81b9b3f67e1c8fdba37fc5b17bb8e42c9715006b /src/dolphincontextmenu.cpp | |
| parent | 29acb196ab7f7add77c6656dc911786d6f786127 (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/dolphincontextmenu.cpp')
0 files changed, 0 insertions, 0 deletions