Skip to content
Commit 1e9bce27 authored by Benjamin Bentmann's avatar Benjamin Bentmann
Browse files

Made ConflictResolver.NodeInfo static

parent b41a409f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment