diff options
| author | l10n daemon script <[email protected]> | 2017-12-28 04:40:23 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-12-28 04:40:23 +0100 |
| commit | 7aa6a8ec1e4b0c424a8077fb5eccb26a49de8592 (patch) | |
| tree | 1997db1f6510d8ecbb33d893316e47631c2477b8 /src/global.cpp | |
| parent | c0e6342b7f69a6c2bff565217445f684743f962f (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/global.cpp')
0 files changed, 0 insertions, 0 deletions