diff options
| author | l10n daemon script <[email protected]> | 2015-04-26 09:44:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-26 09:44:42 +0000 |
| commit | 06776451a72c395fca4b40196a6617366167ad66 (patch) | |
| tree | 5aa85d73868c4ca5733b5dc02aef7738e7d39291 /src/dolphintabwidget.h | |
| parent | 0daae5336714c2124171ca89415eb8bf6098519d (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/dolphintabwidget.h')
0 files changed, 0 insertions, 0 deletions