diff options
| author | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
| commit | 799c532d239c2c04cb7fe5014aceba449268fd3d (patch) | |
| tree | 48493d409c5b2d623e4b2bb1e470a00e61369737 /CMakeLists.txt | |
| parent | 85f5156a332c5e2e38facf390dafd6a1fdf1c9a2 (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