diff options
| author | l10n daemon script <[email protected]> | 2022-06-02 01:44:29 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-02 01:44:29 +0000 |
| commit | 165448bc7f5dc943c259b37d9e3438335ca0251e (patch) | |
| tree | 203db107cd972fe548890c5ad9bef794b83d1519 /src/global.cpp | |
| parent | 9bb2b0a6a80298d33f6c568bef051d98e8fff3d9 (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