diff options
| author | l10n daemon script <[email protected]> | 2020-09-10 10:12:36 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-10 10:12:36 +0200 |
| commit | 214b0172661d9907ac2959f6331b3331f0b827f9 (patch) | |
| tree | 48a00013ffabd496882d31a478cd86489e333d2c /src/dolphindockwidget.cpp | |
| parent | ae5ac1dbb8b960925366710ed5cc4906d1643e46 (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/dolphindockwidget.cpp')
0 files changed, 0 insertions, 0 deletions