diff options
| author | l10n daemon script <[email protected]> | 2022-05-18 01:44:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-18 01:44:40 +0000 |
| commit | b700c94d3eab387cfdef5aea5460fde5d2efa5bd (patch) | |
| tree | ef592033f8d3662ebe6379a762e7308ea2d28f4e /src/dolphinurlnavigator.cpp | |
| parent | e34eba7e0fe1720830fd410e4df42205d28f355a (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/dolphinurlnavigator.cpp')
0 files changed, 0 insertions, 0 deletions