diff options
| author | l10n daemon script <[email protected]> | 2019-01-28 05:21:42 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-01-28 05:21:42 +0100 |
| commit | 52c019c9cbf679af5c24438bbe840ef890ae3f92 (patch) | |
| tree | adfc067569f7eece8812a24a36c1b2a1a74d6353 /src/main.cpp | |
| parent | 2100a7a5c85931d46b72d391faa3d136d4401010 (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/main.cpp')
0 files changed, 0 insertions, 0 deletions