diff options
| author | l10n daemon script <[email protected]> | 2018-01-09 04:56:51 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-01-09 04:56:51 +0100 |
| commit | c2f6e5d669a002c1ee7bf77ba8e16a545bec171d (patch) | |
| tree | 7a0d2d874dbaf0dcba21e3414b18baa60ff7a0a6 /CMakeLists.txt | |
| parent | 94b2b2a2dbd3b861f74277b273ab268f28e8678a (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 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions