Skip to content
Snippets Groups Projects
Commit 02f56539 authored by Chris Davidson's avatar Chris Davidson
Browse files

Fix merge mistakes 

Not quite sure whats going on but this should fix it.
parent bf88a2c0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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