diff options
| author | l10n daemon script <[email protected]> | 2021-12-15 01:57:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-15 01:57:54 +0000 |
| commit | 1421af70eb8efd7dedf352bc46c8afcff564fc9a (patch) | |
| tree | 0d0a3b4affe8942868b970b678db585ead1ef3a1 /src/dolphinpart_ext.cpp | |
| parent | b4e3c2645eb2c018e36e8785a58dad39e9d29887 (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_ext.cpp')
0 files changed, 0 insertions, 0 deletions