diff options
| author | l10n daemon script <[email protected]> | 2019-01-28 08:29:51 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-01-28 08:29:51 +0100 |
| commit | df3c2c1391a59a4d7d55365c6259f786e81ae642 (patch) | |
| tree | 9ac6c5d7f8bca9122210f6566f750d0dba41958a /src/global.cpp | |
| parent | 8f051a391db543a05c00bc1323634a48d7e6444d (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