diff options
| author | l10n daemon script <[email protected]> | 2022-06-16 01:56:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-16 01:56:58 +0000 |
| commit | ebe3a111e68b14fd5e8e9a7b1764c5de4ef6e351 (patch) | |
| tree | 034ba0560bff94eda80d0a532fae80c43cf83048 /src/kitemviews | |
| parent | 8aa81a1dc7fa978d44d2c6397df270432df1506f (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/kitemviews')
0 files changed, 0 insertions, 0 deletions