diff options
| author | l10n daemon script <[email protected]> | 2022-04-19 01:48:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-19 01:48:03 +0000 |
| commit | 0dfa3611de7a0292f1d61ad132328df8ac776b12 (patch) | |
| tree | 6f44bb1785244565a502c724f463286751cfe9a9 /src/middleclickactioneventfilter.cpp | |
| parent | fb0a3c03a6d7f871f6a83b57830730921b1ffe7c (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/middleclickactioneventfilter.cpp')
0 files changed, 0 insertions, 0 deletions