diff options
| author | l10n daemon script <[email protected]> | 2022-05-02 01:41:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-02 01:41:17 +0000 |
| commit | e148329393c749cd20153bda5b1873f5b93bb6f2 (patch) | |
| tree | 1e67333c18a5c13914b944aaa9b2fb6fb496c0d0 /src/global.cpp | |
| parent | 8fda69892284144a8aea3845d2aad844021c99d2 (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/global.cpp')
0 files changed, 0 insertions, 0 deletions