diff options
| author | l10n daemon script <[email protected]> | 2019-01-06 08:35:14 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-01-06 08:35:14 +0100 |
| commit | 5d9ad8d24fd495e861d5c9c88d5a5cb292365b22 (patch) | |
| tree | 8b97a6066eb2a3904e64656ce9c3ceb15aa52a78 /src/global.cpp | |
| parent | 504db3f702625c63cb304430e60ab21b9411cb96 (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