Commit Graph

1 Commits

Author SHA1 Message Date
Mykhailo Bykhovtsev
43cd737a78 Getting rid of mm1 and moving merge conflict resolution to mm2 (#5617)
This PRs gets rid of mm1 and moves merge conflict resolution entirely to mm2.
2018-11-17 00:52:49 +02:00