Skip to content
Snippets Groups Projects
Commit c6373b7c authored by Brian Carrier's avatar Brian Carrier
Browse files

fixed #236 caused by me not resolving conflicts properly before

parent 670b5bc9
Branches
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment