diff options
| author | l10n daemon script <[email protected]> | 2022-11-19 01:51:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-11-19 01:51:46 +0000 |
| commit | b72f800ac4b299af5546f70deb4b7664f5890d89 (patch) | |
| tree | efe127b08d1b3b418e550aabf38d5e616eb383f1 /src/views/dolphinview.cpp | |
| parent | c1a5c5076d9f0011e59a781acd70849672b07a47 (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/views/dolphinview.cpp')
0 files changed, 0 insertions, 0 deletions