diff options
| author | l10n daemon script <[email protected]> | 2019-02-22 05:30:16 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-02-22 05:30:16 +0100 |
| commit | 33581c60c7f7df69ffcad5bda77e9b54e08ed14b (patch) | |
| tree | 61ce8dc8053ff28b019d6a23a36d03619b775ee8 /src/dolphinplacesmodelsingleton.cpp | |
| parent | ed82cca0c0764030e3c33c603104b577b1ab4552 (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