diff options
| author | l10n daemon script <[email protected]> | 2019-11-11 05:17:33 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-11-11 05:17:33 +0100 |
| commit | b9a2df09fcb5f7e1e62b742d32e961437a988da8 (patch) | |
| tree | e3d2cdbdd9f54be9fb30aadd4715aad08787ba93 /src/panels/information/informationpanel.cpp | |
| parent | 4c81a78bae9ed8f927334f6b1f0475dc9159cba7 (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/panels/information/informationpanel.cpp')
0 files changed, 0 insertions, 0 deletions