diff options
| author | l10n daemon script <[email protected]> | 2021-01-14 07:07:18 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-01-14 07:07:18 +0100 |
| commit | 9b55f5d0f9ca625c5b98096b8a9d2560c7c22a32 (patch) | |
| tree | ada8e8135990b73b9380f97e40002653621c421f /src/dolphinpart.cpp | |
| parent | 138c5017d918de8f7487a9e26081119e302043fd (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/dolphinpart.cpp')
0 files changed, 0 insertions, 0 deletions