diff options
| author | l10n daemon script <[email protected]> | 2018-03-13 05:14:09 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-03-13 05:14:09 +0100 |
| commit | 6ab76d791caa552091057f88365b24847014ff1d (patch) | |
| tree | 9f9e0cd8d12e0446a1a895136efba2806b806614 /src/dolphinviewcontainer.h | |
| parent | 68a924af05e7adf1c36b8139ee33a739298fe36d (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/dolphinviewcontainer.h')
0 files changed, 0 insertions, 0 deletions