diff options
| author | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
| commit | da7a6a16f8f95d4328215e6f708b051a66899d88 (patch) | |
| tree | b3453c56f05896c91a037db6f95eda1cf72c6ab6 /src/global.cpp | |
| parent | b07a63797b36c504959d632ff839a7ced1249dc1 (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