diff options
| author | l10n daemon script <[email protected]> | 2017-12-20 07:02:02 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-12-20 07:02:02 +0100 |
| commit | c0e6342b7f69a6c2bff565217445f684743f962f (patch) | |
| tree | 76f609afcffef3d657a638a72e0b017b188dc745 /src/views/versioncontrol | |
| parent | 5f1df43b87898b380228a3548553de3290ddb0d7 (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/views/versioncontrol')
0 files changed, 0 insertions, 0 deletions