Skip to content
Snippets Groups Projects
Commit 6ab34a5c authored by B.Anderson's avatar B.Anderson
Browse files

fixed merge 

Merge branch 'master' of git.soton.ac.uk:ba1e12/workflow

Conflicts:
	README.md
parents 949fb33f cb76643b
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.
Please register or to comment