diff options
| author | l10n daemon script <[email protected]> | 2021-12-03 01:47:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-03 01:47:17 +0000 |
| commit | 9ec88ec1aea35abedf3319d331c7a05188b7dba5 (patch) | |
| tree | 908eceaeb05757d2395e0e60a25f30560744b5d8 /src/userfeedback/placesdatasource.cpp | |
| parent | 1939609e703b89d7e2c06514e373857ff2bc925b (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