diff options
| author | l10n daemon script <[email protected]> | 2022-08-03 01:49:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-08-03 01:49:02 +0000 |
| commit | 86c103e765231f1d4daa0507698548af035d0048 (patch) | |
| tree | 96518c7b37956a3fc5ac3c5d4b9020556c1cb023 /src/dolphinplacesmodelsingleton.cpp | |
| parent | 227ccfdd3d745906d9a29144e4423f62073dd0cf (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