Skip to content
Snippets Groups Projects
Commit ceb98d0b authored by Ben Anderson's avatar Ben Anderson
Browse files

fixed conflict in readme 

Merge branch 'master' of git.soton.ac.uk:SERG/mapping-with-r

# Conflicts:
#	README.md
parents e7ac0690 ea68ce43
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 5 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