Commit graph

2 commits

Author SHA1 Message Date
tobiasKaminsky
4bf40b5860
fix wrong assumption how conflict dialog show work
updated tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-17 09:49:59 +01:00
tobiasKaminsky
ae08a42f8a
Enhance conflict dialog
- fix bug
- add ui tests
- add instrumented tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00