diff options
| author | pjotrp | 2016-02-08 10:05:38 +0100 |
|---|---|---|
| committer | pjotrp | 2016-02-08 10:05:38 +0100 |
| commit | 933fb9c8ad9ff48260bd1c72b5cb54993d41d393 (patch) | |
| tree | 4d2e60d08b45a44d520a9b3adaafc21f20c21e42 /wqflask/base | |
| parent | 9e94750531ef926c92929cc6cdf26cf98151b046 (diff) | |
| parent | 10ae56e0dcc7ac76c671789a67b754d0e1dd03ec (diff) | |
| download | genenetwork2-933fb9c8ad9ff48260bd1c72b5cb54993d41d393.tar.gz | |
gitignore: resolved conflict
Diffstat (limited to 'wqflask/base')
| -rwxr-xr-x | wqflask/base/webqtlConfig.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py index 330fec56..4f9b3af3 100755 --- a/wqflask/base/webqtlConfig.py +++ b/wqflask/base/webqtlConfig.py @@ -55,7 +55,7 @@ COMMON_LIB = GNROOT + 'support/admin' HTMLPATH = GNROOT + 'genotype_files/' PYLMM_PATH = '/home/zas1024/plink_gemma/' SNP_PATH = '/home/zas1024/snps/' -IMGDIR = GNROOT + '/wqflask/wqflask/images/' +IMGDIR = GNROOT + '/wqflask/output/' IMAGESPATH = HTMLPATH + 'images/' UPLOADPATH = IMAGESPATH + 'upload/' TMPDIR = '/home/zas1024/tmp/' # Will remove this and dependent items later |