diff options
| author | l10n daemon script <[email protected]> | 2021-01-04 06:42:11 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-01-04 06:42:11 +0100 |
| commit | 8c4d4b9a129b3b5dd54a7f6d67f2cf3059c7f404 (patch) | |
| tree | 21aeb3717e736edff1b9d835bcbfdaf08d180749 /src/dolphintabpage.cpp | |
| parent | f8d1b494db19904679101139eb81a5715061aa11 (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