diff options
| author | l10n daemon script <[email protected]> | 2022-05-01 01:55:50 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-01 01:55:50 +0000 |
| commit | ce720337e5f7db8fa52b5f092b4cb5c4154abac0 (patch) | |
| tree | 46a4c6710963739af79fe29df0a9e23ba85eeddd /src/dolphinplacesmodelsingleton.cpp | |
| parent | 5a3c57ffb24f7fcc6975e4a99dc07a007304ada6 (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