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 /.gitignore | |
| parent | 9e94750531ef926c92929cc6cdf26cf98151b046 (diff) | |
| parent | 10ae56e0dcc7ac76c671789a67b754d0e1dd03ec (diff) | |
| download | genenetwork2-933fb9c8ad9ff48260bd1c72b5cb54993d41d393.tar.gz | |
gitignore: resolved conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1e01bc64..51aaabbb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ build/ dist/ *.egg-info/ EGG-INFO/ +wqflask/output/* |