diff options
| author | l10n daemon script <[email protected]> | 2023-01-30 02:05:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-30 02:05:00 +0000 |
| commit | 572f4d2e9ac5dcb188630281227b545af41275bb (patch) | |
| tree | 693701774ce7aa9eb758e8b0366fb927f5aea742 /src/userfeedback/dolphinfeedbackprovider.cpp | |
| parent | 4a3ddf29f96d935c0a8e550f7a32d94d74eb8b39 (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/userfeedback/dolphinfeedbackprovider.cpp')
0 files changed, 0 insertions, 0 deletions