diff options
| author | l10n daemon script <[email protected]> | 2015-07-26 19:57:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-07-26 19:57:51 +0000 |
| commit | d1871eb1b84fa9697b69d98eac02ca0a58874a65 (patch) | |
| tree | bd0f9db85ba7324a106c925c1666b76b5cbbb355 /cmake | |
| parent | 8d2a8a0f920cfe1c7f2d24053ded0743d3047fb5 (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 'cmake')
0 files changed, 0 insertions, 0 deletions