diff options
| author | l10n daemon script <[email protected]> | 2022-04-05 02:58:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-05 02:58:27 +0000 |
| commit | 50c3be0ca0645d81dd10bde8441dc593b237c0d1 (patch) | |
| tree | e0118cb62a9d2158330bbb6e6c4390282ea8789a /src/dolphinmainwindow.cpp | |
| parent | 2de8f4c0fb2141f68400327a4f87eefa71d81e3c (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/dolphinmainwindow.cpp')
0 files changed, 0 insertions, 0 deletions