diff options
| author | l10n daemon script <[email protected]> | 2017-12-28 06:01:08 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-12-28 06:01:08 +0100 |
| commit | 09dd74348ed16d90577fd7dcf13ed59bc9116cf7 (patch) | |
| tree | 4c7f274b3f010543e2eb902b10f263ef7df956cf /src/org.kde.dolphin.appdata.xml | |
| parent | 91eb6aa37ae38c73441b6100a4ea9beb35e982f4 (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