diff options
| author | l10n daemon script <[email protected]> | 2023-03-26 01:45:57 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-03-26 01:45:57 +0000 |
| commit | 080572c67a3eb02288886c7fc8a170ae8f151d97 (patch) | |
| tree | d6e08aace9441bb186cfadd185ac94f8d5b1fa7f /src/dolphintabpage.cpp | |
| parent | 09f25ee461e4381c663aad4bd74928b8ee64f699 (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/dolphintabpage.cpp')
0 files changed, 0 insertions, 0 deletions