diff options
| author | l10n daemon script <[email protected]> | 2022-04-29 01:44:43 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-29 01:44:43 +0000 |
| commit | 776d746c6795b19dd5e21390654a69bce3c4dc3f (patch) | |
| tree | 46f16c92e9e3ad506c0ab9d8346acc0e0095a5ee /src/dolphinplacesmodelsingleton.cpp | |
| parent | f08a8dd06b5658a4b62fa3a1550ef39fec722a7e (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