Merge branch 'master' into devel

Jürgen Knödlseder
2 parents 807e0a97 9ead1e8d
Showing 3 changed files with 2 additions and 8 deletions
dev/01-ctools-activate.sh
dev/ctools-activate.sh
dev/ctools-deactivate.sh
@@ -3,3 +3,5 @@
 export CTOOLS=${CONDA_PREFIX}
 source ${CTOOLS}/bin/ctools-init.sh
 unset PYTHONPATH
+unset LD_LIBRARY_PATH
+unset DYLD_LIBRARY_PATH
-#!/bin/sh
-
-export CTOOLS=${CONDA_PREFIX}
-source ${CTOOLS}/bin/ctools-init.sh
-#!/bin/sh
-
-unset CTOOLS
-unset CALDB