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 /genotype_files | |
| 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 'genotype_files')
| -rw-r--r-- | genotype_files/genotypes/.gitattributes | 1 | ||||
| -rw-r--r-- | genotype_files/new_genotypes/.gitattributes | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/genotype_files/genotypes/.gitattributes b/genotype_files/genotypes/.gitattributes deleted file mode 100644 index c311ac85..00000000 --- a/genotype_files/genotypes/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.geno filter=lfs -crlf diff --git a/genotype_files/new_genotypes/.gitattributes b/genotype_files/new_genotypes/.gitattributes deleted file mode 100644 index 912ed80c..00000000 --- a/genotype_files/new_genotypes/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.json filter=lfs -crlf |