diff options
| author | l10n daemon script <[email protected]> | 2022-02-05 01:47:47 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-02-05 01:47:47 +0000 |
| commit | cd6664c5695af0556ed8b178791e70a8f902eb20 (patch) | |
| tree | 8d342abbf80e8a9d1dd34e11661b914a568c609b /src/dolphinplacesmodelsingleton.h | |
| parent | ce7852fb2352155e4373f9a41f0a01549985bd45 (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.h')
0 files changed, 0 insertions, 0 deletions