diff options
| author | l10n daemon script <[email protected]> | 2025-11-15 01:35:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-11-15 01:35:35 +0000 |
| commit | 3bd5568dd17b677f45dcb1e2b2b120c143536b84 (patch) | |
| tree | 6aac7e461596ee1833791e638c2fd8a66af2ad86 /src/dolphinplacesmodelsingleton.cpp | |
| parent | 8aa12426596b2101cd54bc81ab5d3f07f799b368 (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