Skip to content
Snippets Groups Projects
Commit 38d39839 authored by Andrew Heather's avatar Andrew Heather
Browse files

GIT: remove remnants of conflict

parent 4a12679a
1 merge request!25Merge foundation
This commit is part of merge request !25. Comments created here will be created in the context of that merge request.
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