diff options
| author | l10n daemon script <[email protected]> | 2022-03-29 02:21:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-29 02:21:23 +0000 |
| commit | 447c35868c6268789e8f2ae0abecd28df02029d8 (patch) | |
| tree | 044ad27ca6bee897246b15b827ac1be605ea2091 /src/views/tooltips/tooltipmanager.h | |
| parent | d658c7e09024db81266d210fa8932cb5ab2d6190 (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/tooltips/tooltipmanager.h')
0 files changed, 0 insertions, 0 deletions