diff options
| author | l10n daemon script <[email protected]> | 2020-07-15 05:52:19 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-07-15 05:52:19 +0200 |
| commit | 1995668f8e279209c092287d6b5da5f4bcb4dd9e (patch) | |
| tree | 8aff0777203acb5414e70aaeab36d892d7e9feb9 /src/dolphinplacesmodelsingleton.cpp | |
| parent | 675699dfc088a86b541624d1dbb825ce674256e1 (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