diff options
| author | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
| commit | 18cd42837f746984ae603513995c07fac8636b75 (patch) | |
| tree | a4a553d4e6de04a787cc5f1dcf0acb87a074ac4b /src/userfeedback/placesdatasource.cpp | |
| parent | 3a25f7628cf51dc1314adf4086f69baa8b6c7952 (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/placesdatasource.cpp')
0 files changed, 0 insertions, 0 deletions