MRG: Resolve conflict with latest foundation merge

This commit is contained in:
Andrew Heather
2016-10-26 15:37:15 +01:00
243 changed files with 11116 additions and 28853 deletions

View File

@ -86,8 +86,9 @@ unsetenv WM_THIRD_PARTY_DIR
unsetenv FOAM_APPBIN
unsetenv FOAM_APP
unsetenv FOAM_EXT_LIBBIN
unsetenv FOAM_CODE_TEMPLATES
unsetenv FOAM_ETC
unsetenv FOAM_EXT_LIBBIN
unsetenv FOAM_INST_DIR
unsetenv FOAM_JOB_DIR
unsetenv FOAM_LIBBIN