diff options
| author | l10n daemon script <[email protected]> | 2021-12-18 01:49:43 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-18 01:49:43 +0000 |
| commit | e980dd20d6e091abddedc7654f2d89c2913bcd1e (patch) | |
| tree | ebf45237e15cadcac3277918085db5494da758fa /src/dolphinpart.cpp | |
| parent | ff693a00c8683e49fb9b9746344a63cf722435d6 (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/dolphinpart.cpp')
0 files changed, 0 insertions, 0 deletions