diff options
| author | Al <gabriel.cortesi@outlook.com> | 2019-05-21 11:23:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 11:23:08 +0200 |
| commit | 0078fd12d0fb2de4fab6f9726b0c64cf5fa8da00 (patch) | |
| tree | 4cd3e4b51b3ea43a866aa74c3e11bb9b5f0d30b0 /src/queryoverwritedialog.cpp | |
| parent | f966e7db9363230673ce5a85dd1ab53846f73521 (diff) | |
| parent | 0088ee963b25495e6cce790005dcf1356a73e7b8 (diff) | |
Merge pull request #726 from isanae/Develop
adds a no-conflict list in the conflicts tab, makes all three lists collapsible
Diffstat (limited to 'src/queryoverwritedialog.cpp')
0 files changed, 0 insertions, 0 deletions