diff options
| author | l10n daemon script <[email protected]> | 2019-09-25 05:15:10 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-09-25 05:15:10 +0200 |
| commit | a2730fad4323c3af0b5198a31021eed9c9a336e7 (patch) | |
| tree | d713e3f00da2f918cc9dac3b837bec1829d6bc3e /src/middleclickactioneventfilter.cpp | |
| parent | c0ca8f2c79c9b0e9f6db47dd86a1434d4e3de5bb (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