diff options
| author | l10n daemon script <[email protected]> | 2015-11-21 18:58:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-21 18:58:19 +0000 |
| commit | 0587f994dc408e9ea98b0007f44179e2e4b6d4d0 (patch) | |
| tree | 7244eb4dc4549707a5017fff6378b5b571f948a2 /src/settings/kcm/kcmdolphinviewmodes.desktop | |
| parent | ed3bb94ea095e3ba3e3b96584d817899121e1653 (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/settings/kcm/kcmdolphinviewmodes.desktop')
0 files changed, 0 insertions, 0 deletions