diff options
| author | l10n daemon script <[email protected]> | 2016-10-10 09:41:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-10-10 09:41:54 +0000 |
| commit | 82cfc125f4fd37083e3adf3c5d2b999124262807 (patch) | |
| tree | e16607582d0551b17a0e7367e0b8167df64c6b20 /src/views/viewmodecontroller.cpp | |
| parent | 0309bb18185f77c425cf7c69508f049c439eedb0 (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/viewmodecontroller.cpp')
0 files changed, 0 insertions, 0 deletions