aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorZachary Sloan2013-06-13 22:45:01 +0000
committerZachary Sloan2013-06-13 22:45:01 +0000
commit78998b9400bba9ecc9fdd5e50eef1405bb3625c1 (patch)
tree88da507baa1ccda96165a908257d891204259d3b /wqflask/base
parentaac1dd2f9c5b216b24c6e35676ba5d50f9d5d3c2 (diff)
parent0e633460f37cb9b7c23805c4c31b1044e0704d1b (diff)
downloadgenenetwork2-78998b9400bba9ecc9fdd5e50eef1405bb3625c1.tar.gz
Merge /home/sam/gene into flask
Conflicts: wqflask/wqflask/templates/index_page.html Merging the code on Sam's branch onto my own
Diffstat (limited to 'wqflask/base')
-rwxr-xr-xwqflask/base/webqtlConfig.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index 49afb631..a811c3cd 100755
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -52,7 +52,7 @@ ENSEMBLETRANSCRIPT_URL="http://useast.ensembl.org/Mus_musculus/Lucene/Details?sp
SECUREDIR = GNROOT + 'secure/'
COMMON_LIB = GNROOT + 'support/admin'
HTMLPATH = GNROOT + 'web/'
-PYLMM_PATH = HTMLPATH + 'plink/'
+PYLMM_PATH = '/home/zas1024/'
SNP_PATH = '/mnt/xvdf1/snps/'
IMGDIR = HTMLPATH +'image/'
IMAGESPATH = HTMLPATH + 'images/'