Skip to content
Snippets Groups Projects
Commit ac2c5163 authored by florian's avatar florian
Browse files

TST: Add unittest for merge conflict

parent ab1e6de7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment