diff options
| author | l10n daemon script <[email protected]> | 2021-01-05 06:38:36 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-01-05 06:38:36 +0100 |
| commit | 49e8b67b7121d19a88a9e0d114f849a6c928f5cc (patch) | |
| tree | 1c5be1e3b915c4fa39ce423ddd4b92934731919f /src/dolphintabpage.cpp | |
| parent | 8c4d4b9a129b3b5dd54a7f6d67f2cf3059c7f404 (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