Skip to content
Commit e4fe5396 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Fix, better messages from conflict detector.

parent dea47d64
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