diff options
| author | l10n daemon script <[email protected]> | 2021-12-31 01:44:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-31 01:44:30 +0000 |
| commit | c40fe3b88602441e06e8b8fbbcdfa95c27261b01 (patch) | |
| tree | d71d79906b3243911d1faccbe67199cf3c3a3859 /src/dolphindockwidget.cpp | |
| parent | 694e4e24526c5f55e162ad9288782e7c82cac38f (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