diff options
| author | l10n daemon script <[email protected]> | 2021-08-09 02:11:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-09 02:11:38 +0000 |
| commit | e101560f8448470a629e70e78ca3571c222036ff (patch) | |
| tree | edf83db17dc1e1ee623649eef77d67bfee238491 /src/main.cpp | |
| parent | 9fc1e5397b4f625c6cebd0937378a2f9b337e78f (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