diff options
| author | l10n daemon script <[email protected]> | 2025-06-01 01:36:41 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-01 01:36:41 +0000 |
| commit | 41c7a9267f32424eda40c73ff691688173a47dbe (patch) | |
| tree | c8699d5f86d4d4874afefe81f6300fd44b8f3111 /src/dolphinpart.cpp | |
| parent | 3e4d9ca10c33746cb545e930886491e6a1227e6e (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/dolphinpart.cpp')
0 files changed, 0 insertions, 0 deletions