diff options
| author | l10n daemon script <[email protected]> | 2022-04-07 01:45:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-07 01:45:45 +0000 |
| commit | 9a334caf7d46f5d87079545bd2e67df13a56ed56 (patch) | |
| tree | 4c00eb176c69edf73cd4c5744d619c2e3666ebc7 /src/org.kde.dolphin.desktop | |
| parent | 989d19c126abc35f5c6df2a1117334f1468e48e8 (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.desktop')
0 files changed, 0 insertions, 0 deletions