Commit 7eb81bda authored by pescobar's avatar pescobar
Browse files

Merge branch 'develop' of https://github.com/hpcugent/easybuild-easyconfigs into emboss_java

Conflicts:
	easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb
	easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
	easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb
parents 008234b4 30308fcf
Supports Markdown
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