Skip to content
Snippets Groups Projects
Commit 4bf75fff authored by Easy Build's avatar Easy Build
Browse files

Tue, 12 Dec 2017 08:56:24 +0100

parent edcd43d6
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,6 @@ if [ ! -z `hostname -f | grep "bullx"` ]; then ...@@ -15,7 +15,6 @@ if [ ! -z `hostname -f | grep "bullx"` ]; then
./modules.py > anselm.md ./modules.py > anselm.md
else else
ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",2"}' | grep -v -e '/,\|:' > salomon.csv ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",2"}' | grep -v -e '/,\|:' > salomon.csv
<<<<<<< HEAD
./modules.py > salomon.md ./modules.py > salomon.md
MODULEBASE="/appsuv/modules" MODULEBASE="/appsuv/modules"
...@@ -41,10 +40,6 @@ else ...@@ -41,10 +40,6 @@ else
ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",3"}' | grep -v -e '/,\|:' > uv2000.csv ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",3"}' | grep -v -e '/,\|:' > uv2000.csv
./modules.py > uv2000.md ./modules.py > uv2000.md
=======
./modules.py > salomon.md
>>>>>>> 2bf4ea5a110c8c72df1999bc0bb501df63492ea0
fi fi
DATE=`date -R` DATE=`date -R`
......
This diff is collapsed.
This diff is collapsed.
<<<<<<< HEAD
FastQC/0.11.3,3 FastQC/0.11.3,3
GATK/2.6-5-Java-1.7.0_79,3 GATK/2.6-5-Java-1.7.0_79,3
SnpEff/4.1_G,3 SnpEff/4.1_G,3
...@@ -273,5 +272,3 @@ gettext/0.19.8,3 ...@@ -273,5 +272,3 @@ gettext/0.19.8,3
gettext/0.19.8.1,3 gettext/0.19.8.1,3
libGLU/9.0.0,3 libGLU/9.0.0,3
pixman/0.34.0,3 pixman/0.34.0,3
=======
>>>>>>> 2bf4ea5a110c8c72df1999bc0bb501df63492ea0
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment