diff options
| author | l10n daemon script <[email protected]> | 2020-09-23 06:39:00 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-23 06:39:00 +0200 |
| commit | 06d629ec6e59c1956e050c304ea7058f2fec89aa (patch) | |
| tree | 84581e6f87ae8f7285737527bcdebfcf412b4924 /src/dolphinpart.cpp | |
| parent | 15928112ce57902d1b5e0f9f6870b625d6b8056f (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