diff options
| author | l10n daemon script <[email protected]> | 2023-11-07 03:15:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-07 03:15:28 +0000 |
| commit | d558c9a5dd8082488ea884feece22c1add1ea6cd (patch) | |
| tree | 4d6e0d79627ace2f475fad8d9b92cb8b5a356dc2 /src/settings/viewpropsprogressinfo.h | |
| parent | 5644e08579963e63443a3d62d44b885b992c35b3 (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/viewpropsprogressinfo.h')
0 files changed, 0 insertions, 0 deletions