Skip to content
GitLab
Commit d35410da authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge pull request #1870 from boegel/fix_conflict_detection 

fix conflict detection in unit tests
parents 4c29e4f3 ec17b3b5
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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