diff options
| author | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
| commit | 4e96b1a42f7718d7c2401e5abed3e30267f7e0ea (patch) | |
| tree | bd7347e3f0f25b217f16765c83f708f4bab549ea /src/global.cpp | |
| parent | de84f223d4408dc1eaf6f15ebeed2e8acf49ad4c (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