diff options
| author | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
| commit | a8a4981b2c58090c01cc96da933022909d6adf6b (patch) | |
| tree | 05b8a39ae915503b8fe9b63b00d399a415d642d4 /src/dolphin.appdata.xml | |
| parent | 1c1efb983c60ea57422317186047f744e23df114 (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/dolphin.appdata.xml')
0 files changed, 0 insertions, 0 deletions