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

Merge pull request #256 from boegel/conflict_unit_testing 

add unit test to check for conflicts
parents d0564197 626b8d9d
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