diff options
| author | l10n daemon script <[email protected]> | 2022-04-09 01:51:05 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-09 01:51:05 +0000 |
| commit | c4092e9047adb04895e007013be50fe50bf40f67 (patch) | |
| tree | 6546e0def1e3dc086b9a4aa48bbe44667362f038 /src/dolphinmainwindow.cpp | |
| parent | 9a334caf7d46f5d87079545bd2e67df13a56ed56 (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/dolphinmainwindow.cpp')
0 files changed, 0 insertions, 0 deletions