diff options
| author | l10n daemon script <[email protected]> | 2021-12-10 01:45:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-10 01:45:23 +0000 |
| commit | 4451c9f2df5b72e63033d3b91bd218ba9ea5cd3a (patch) | |
| tree | 636e537a0a127d088008b95130ee9d0143ad0111 /src/settings/general/statusbarsettingspage.cpp | |
| parent | 188b73e7d416a0edcf6bce69cbf8cd089cb30752 (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/settings/general/statusbarsettingspage.cpp')
0 files changed, 0 insertions, 0 deletions