Skip to content
Snippets Groups Projects
Commit 7aac6b39 authored by Meredith L. Patterson's avatar Meredith L. Patterson
Browse files

Merge branch '87-transition-conflict' into 'master' 

add regression test for issue 87 - same as issue 91

Closes #87

See merge request hammer/hammer!37
parents 14176a1c 7cf23b76
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 0 deletions
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