diff options
| author | l10n daemon script <[email protected]> | 2023-03-02 02:25:05 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-03-02 02:25:05 +0000 |
| commit | 6adbb73b992c6196e4c46023aafcf245574702e7 (patch) | |
| tree | 95c73c2e3ef64d6870d2ad84f8d8f68ebb747477 /src/settings/dolphinsettingsdialog.cpp | |
| parent | 74ecb5b9b473ad9a39c32eca8f7d2707345ab1c3 (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/settings/dolphinsettingsdialog.cpp')
0 files changed, 0 insertions, 0 deletions