diff options
| author | l10n daemon script <[email protected]> | 2024-08-05 01:22:56 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-05 01:22:56 +0000 |
| commit | 8fb06607483553cf83faf33a8ae88e9c468420ab (patch) | |
| tree | baea27e39f37b6d1b9c22e02c6026d865b4b004e /src/selectionmode/topbar.cpp | |
| parent | f98383e84d4834cadadf7f58d48cd728cb36449f (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/selectionmode/topbar.cpp')
0 files changed, 0 insertions, 0 deletions