diff options
| author | l10n daemon script <[email protected]> | 2022-12-28 02:03:50 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-12-28 02:03:50 +0000 |
| commit | df11f2f168911c3d350216ddb013daac94b9fde4 (patch) | |
| tree | 9b6abeb6916b2e8075c076b25889882a60da68ec /src/dolphinpart.cpp | |
| parent | 42fd1964bdedf8efc41023568f971444bcb0283d (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