diff options
| author | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
| commit | 02647059daa297e7b2b3ca3a2c03d848ae3ad9f2 (patch) | |
| tree | a5d2b5d66a8cff38a9422378c66861a3fb493e80 /environment | |
| parent | 7b2cd4e93114baaa329c483a98d6f7999aad1ba0 (diff) | |
| parent | 7d391d8eb88d27c5637042fefe2d27e7b12f5587 (diff) | |
fix merge conflict
Diffstat (limited to 'environment')
| -rw-r--r-- | environment/LocalConfig.pm | 10 |
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', |