diff options
| author | l10n daemon script <[email protected]> | 2022-06-13 02:41:50 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-13 02:41:50 +0000 |
| commit | 6401e69a4fff3de68fd372e3e0db0a99eba27bde (patch) | |
| tree | 817ac7446c8848b8f0d700ebe05c9ea664fcf760 /src/main.cpp | |
| parent | bce1f06b2692d77be92caae9d9c3d7dbf5f9d7f1 (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 'src/main.cpp')
0 files changed, 0 insertions, 0 deletions