diff options
| author | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
| commit | 1c1efb983c60ea57422317186047f744e23df114 (patch) | |
| tree | ee5cf5fa6ff7a7094138758ce0138ca1a257ae52 /src/global.cpp | |
| parent | 586252341ea69a60b64f404dd23ef93e59c1e16c (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