diff options
| author | l10n daemon script <[email protected]> | 2022-05-04 01:46:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-04 01:46:27 +0000 |
| commit | 506cdf329c3e1de5a876f0c562b4d46a2a96a657 (patch) | |
| tree | 3ccd4d6675dee13ac3aeeff6afb4244660425479 /src/dolphinplacesmodelsingleton.cpp | |
| parent | d958aa57d87ba1b391bac8043949f49fb23fb43c (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