summaryrefslogtreecommitdiff
path: root/environment
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2013-12-04 20:13:07 +0100
committerPatrick Simianer <p@simianer.de>2013-12-04 20:13:07 +0100
commit9ff43d7c8e076aaa8790bacbd4b2cfe636a55a97 (patch)
treee1e0265b18ffc854f24209cb36b2c836100f099b /environment
parente59cdac5253df7ab57296d347245d1a8f4d8b287 (diff)
parent407b100cd3e4ae987504b53101151fba287ad999 (diff)
fix merge conflict
Diffstat (limited to 'environment')
-rw-r--r--environment/LocalConfig.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/environment/LocalConfig.pm b/environment/LocalConfig.pm
index f7c3b1c7..4fa0ab74 100644
--- a/environment/LocalConfig.pm
+++ b/environment/LocalConfig.pm
@@ -63,11 +63,11 @@ my $CCONFIG = {
'JobControl' => 'fork',
'DefaultJobs' => 8,
},
- 'OxfordDeathSnakes' => {
- 'HOST_REGEXP' => qr/^(taipan|tiger).cs.ox.ac.uk$/,
- 'JobControl' => 'fork',
- 'DefaultJobs' => 12,
- },
+# 'OxfordDeathSnakes' => {
+# 'HOST_REGEXP' => qr/^(taipan|tiger).cs.ox.ac.uk$/,
+# 'JobControl' => 'fork',
+# 'DefaultJobs' => 12,
+# },
'cluster.cl.uni-heidelberg.de' => {
'HOST_REGEXP' => qr/node25/,
'JobControl' => 'qsub',