Conflicts: easybuild/easyconfigs/g/git/git-1.7.12-goalf-1.1.0-no-OFED.eb easybuild/easyconfigs/g/git/git-1.7.12-ictce-4.0.6.eb