diff options
| author | l10n daemon script <[email protected]> | 2020-03-02 05:36:51 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-03-02 05:36:51 +0100 |
| commit | b10a84c770d17e06bf3e2999e935ff4dd3a203af (patch) | |
| tree | 904a1fdf90b11220f19695c3e97ea1dded54f41c /CMakeLists.txt | |
| parent | 7a2885853a424042cb631f83a1db278560679d9e (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