diff options
| author | l10n daemon script <[email protected]> | 2016-05-29 12:20:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-05-29 12:20:08 +0000 |
| commit | fe6a7ac9f8b5ce6180fe265ac95b524ecc7805f6 (patch) | |
| tree | 5eeee98ea7fb438017c7d93dd98d5065a33a1ba5 /src/filterbar/filterbar.cpp | |
| parent | bed16191b5e9253d8658c0dac0d336b3dab5e0e3 (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