diff options
| author | zsloan | 2016-02-08 17:55:27 +0000 |
|---|---|---|
| committer | zsloan | 2016-02-08 17:55:27 +0000 |
| commit | d6cace2f544ecd16b43f9d4054d0ae0ac8d74af5 (patch) | |
| tree | 93e5f9b6f50bd4156ed8de758212232ff84934a9 /.gitignore | |
| parent | 7d5dba3e38892475edec80c922f06bcb40b0dcb3 (diff) | |
| parent | 7705462a70d17f65bf34a158ea76f100b56582c8 (diff) | |
| download | genenetwork2-d6cace2f544ecd16b43f9d4054d0ae0ac8d74af5.tar.gz | |
Merge branch 'master' of github.com:genenetwork/genenetwork2 into development
Conflicts: .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 15c0c848..51aaabbb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,8 @@ web/new_genotypes/HSNIH.json wqflask/secure_server.py wqflask/base/webqtlConfig.py -wqflask/wqflask/static/output/* +build/ +dist/ +*.egg-info/ +EGG-INFO/ +wqflask/output/* |