diff options
| author | l10n daemon script <[email protected]> | 2020-06-17 16:57:19 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-17 16:57:19 +0200 |
| commit | d5c1ac07db9bf9d97cab3cc09918286870fa377c (patch) | |
| tree | 9fbd9bca7e1722e0f0a8196c110a1774ce5c2060 /src/org.kde.dolphin.appdata.xml | |
| parent | 418b225f89e39e06f8ce881ecb7889de31ad4c51 (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/org.kde.dolphin.appdata.xml')
0 files changed, 0 insertions, 0 deletions