diff options
| author | l10n daemon script <[email protected]> | 2021-01-21 07:07:06 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-01-21 07:07:06 +0100 |
| commit | aac6a5245f48194828283fe5ed81a212ede6bc3c (patch) | |
| tree | 6f2506c43ddaf8d9a17fd32976ae2227f120b9c5 /CMakeLists.txt | |
| parent | 25bfe6149e729006bdad6bf2a38ebbb3fd188c8e (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