diff options
| author | l10n daemon script <[email protected]> | 2020-09-10 06:35:50 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-10 06:35:50 +0200 |
| commit | 98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e (patch) | |
| tree | 4572b3604d0e83ff75e3f98a8e2c94c7b7339857 /src/dolphintabbar.cpp | |
| parent | 736c9958e7b97ac651a8d7074fd74650ddb5f1ab (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/dolphintabbar.cpp')
0 files changed, 0 insertions, 0 deletions