diff options
| author | l10n daemon script <[email protected]> | 2019-07-31 08:56:25 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-07-31 08:56:25 +0200 |
| commit | 50c1fcce3777c6dbb8ba64824262da3edda98fc3 (patch) | |
| tree | e0de79ccc29352c84eba1aa15a9dfc1db22aeb9e /src/views/dolphinnewfilemenuobserver.cpp | |
| parent | 2baa6d187167825c9d58367e399e04764f5a9c70 (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/views/dolphinnewfilemenuobserver.cpp')
0 files changed, 0 insertions, 0 deletions