diff options
| author | l10n daemon script <[email protected]> | 2025-06-25 01:35:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-25 01:35:28 +0000 |
| commit | c7d4b19b88237551bd7cefe0f79670427f1c90c9 (patch) | |
| tree | 99f80f888b8f84312bc7c3ffc2de81b359305636 /src/dolphinremoveaction.cpp | |
| parent | aba0de7301b060c40d543adbaa8d53cf69a9d7ee (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/dolphinremoveaction.cpp')
0 files changed, 0 insertions, 0 deletions