diff options
| author | l10n daemon script <[email protected]> | 2022-07-02 02:06:49 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-02 02:06:49 +0000 |
| commit | 58a7772a19204f467432d098253a32f0fc705b34 (patch) | |
| tree | 8f568f96ce4d09e00deb4379b6c0c0af939d3a19 /src/views/dolphinview.cpp | |
| parent | 66505d643cb1612cdcf13743de6f8999225fa93c (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/views/dolphinview.cpp')
0 files changed, 0 insertions, 0 deletions