diff options
| author | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
| commit | d11d4781487243dddc3a3899bd65d21542a93383 (patch) | |
| tree | e4221185daeb79c8b8c944576bbc6ce5c6ebdcde /src/main.cpp | |
| parent | dccd8c4899e2811960f60c825ddf433ce174b372 (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