diff options
| author | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
| commit | 22f78c474acec7e2c4a81caa8a4a2d0025bec663 (patch) | |
| tree | 72496d0ecdcd3cc866da8fa7cb398083277f8829 /src/filterbar | |
| parent | 1b985d1ef400de024ed221264a55fd58affdec0c (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')
0 files changed, 0 insertions, 0 deletions