diff options
| author | l10n daemon script <[email protected]> | 2019-06-11 05:13:47 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-06-11 05:13:47 +0200 |
| commit | 9f65f1de47510b92b2d153346f1c414c9fadac9f (patch) | |
| tree | c90606301b9abde5363b246c0c12fd5c35fa15ab /src/filterbar/filterbar.cpp | |
| parent | 7df5fc8edb54153f877eed4690e77968a1b804ba (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/filterbar/filterbar.cpp')
0 files changed, 0 insertions, 0 deletions