diff options
| author | l10n daemon script <[email protected]> | 2022-05-28 02:27:04 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-28 02:27:04 +0000 |
| commit | 734df72e900f500e091a815bf557898b7c302e07 (patch) | |
| tree | d8baa2aab2e8943fb3100d78fd40b79c187b74ae /src/settings/viewpropertiesdialog.cpp | |
| parent | 4cd1b6f9ff2d4aa6304f189121ef8d1ac3783cfb (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/viewpropertiesdialog.cpp')
0 files changed, 0 insertions, 0 deletions