diff options
| author | pjotrp | 2015-11-18 11:19:01 +0100 |
|---|---|---|
| committer | pjotrp | 2015-11-18 11:19:01 +0100 |
| commit | cb0f10fc4850b6b06f2237b532317a5c6668584a (patch) | |
| tree | d143662ecceac5e05bd06afee4c87b2beb88859b /.gitignore | |
| parent | 28ec342362ba068b3d0b5b9a302bc279d251f160 (diff) | |
| parent | 0310301b30c59eca45235cd1bd1ff8e15923950a (diff) | |
| download | genenetwork2-cb0f10fc4850b6b06f2237b532317a5c6668584a.tar.gz | |
Merge branch 'master' of https://github.com/zsloan/genenetwork2 into zsloan
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -2,9 +2,8 @@ *.pyc *.orig *.bak +*.cross *~ web/new_genotypes/HSNIH.json -*.cross -*webqtlConfig.py wqflask/secure_server.py - +wqflask/base/webqtlConfig.py |