diff options
| author | zsloan | 2015-04-06 21:34:23 +0000 |
|---|---|---|
| committer | zsloan | 2015-04-06 21:34:23 +0000 |
| commit | 1823434ff8b54df0bd8ce1d7d19a37d74e850dd5 (patch) | |
| tree | 0d28ffb56862d41e71dfb23708241e8c7342ab9a /.gitignore | |
| parent | 4ad55a0ebc1fc77da8e9aa6ec565b2b10c373e9b (diff) | |
| parent | 0e21a58cfe7ca1ec6c1d84c43e1d2fd2d0b9104c (diff) | |
| download | genenetwork2-1823434ff8b54df0bd8ce1d7d19a37d74e850dd5.tar.gz | |
Added secure_server.py to gitignore and fixed conflicts for merging Lei's new code
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1111cbc7..1108f228 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ web/new_genotypes/HSNIH.json *.cross *webqtlConfig.py +wqflask/secure_server.py + |