diff options
| author | l10n daemon script <[email protected]> | 2021-12-11 01:42:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-11 01:42:51 +0000 |
| commit | ce8d4e5bcd125f45dfebf11ec53234b733de61ff (patch) | |
| tree | 14511ab6fe4ba2a698599dc84b0aa733d0363a9d /src/org.kde.dolphin.appdata.xml | |
| parent | 4451c9f2df5b72e63033d3b91bd218ba9ea5cd3a (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