Skip to content
Commit af258e0d authored by Bodo Möller's avatar Bodo Möller
Browse files

remove conflict indicator ...

parent 1ec7ac3c
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