diff options
| author | l10n daemon script <[email protected]> | 2020-11-03 06:20:03 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-11-03 06:20:03 +0100 |
| commit | af1e13f9fa86c6a7f9bf397269559eda38e7aec6 (patch) | |
| tree | 170d947e95277d9d35f1d0913308ca6d3b5dae48 /src/dolphincontextmenu.cpp | |
| parent | ffe01ee8407559f46171bfea4aa6f21e37f945fb (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