diff options
| author | l10n daemon script <[email protected]> | 2025-08-23 01:36:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-08-23 01:36:30 +0000 |
| commit | 2f93755e135e799b8de753a0ac17d4389593657f (patch) | |
| tree | c677a0288f4147571e21727fbbaa2cfb10b5a0fd /src/dolphinplacesmodelsingleton.cpp | |
| parent | 2f725d6c911db84a2ad75a9a19a1c157c2c9da09 (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/dolphinplacesmodelsingleton.cpp')
0 files changed, 0 insertions, 0 deletions