fix conflict

ht-diva · Nov 18, 2024 · 8603e3d · 8603e3d
2 parents 39ff9f6 + 2cdfbcb
commit 8603e3d
Show file tree

Hide file tree

Showing 18 changed files with 56,784 additions and 263 deletions.
diff --git a/data/ensembl_gene_annotations.txt b/data/ensembl_gene_annotations.txt
diff --git a/gwasstudio/data/README.md → data/hapmap3/README.md b/gwasstudio/data/README.md → data/hapmap3/README.md
diff --git a/gwasstudio/data/convert_rsid.R → data/hapmap3/convert_rsid.R b/gwasstudio/data/convert_rsid.R → data/hapmap3/convert_rsid.R
diff --git a/gwasstudio/data/hapmap3_snps.csv → data/hapmap3/hapmap3_snps.csv b/gwasstudio/data/hapmap3_snps.csv → data/hapmap3/hapmap3_snps.csv
diff --git a/gwasstudio/data/hapmap3_snps_ID.csv → data/hapmap3/hapmap3_snps_ID.csv b/gwasstudio/data/hapmap3_snps_ID.csv → data/hapmap3/hapmap3_snps_ID.csv
diff --git a/gwasstudio/cli/export.py b/gwasstudio/cli/export.py
diff --git a/gwasstudio/cli/info.py b/gwasstudio/cli/info.py
diff --git a/gwasstudio/cli/ingest.py b/gwasstudio/cli/ingest.py
diff --git a/gwasstudio/cli/__init__.py → gwasstudio/functions/__init__.py b/gwasstudio/cli/__init__.py → gwasstudio/functions/__init__.py
diff --git a/gwasstudio/functions/create_tiledb_schema.py b/gwasstudio/functions/create_tiledb_schema.py
diff --git a/gwasstudio/functions/process_and_ingest.py b/gwasstudio/functions/process_and_ingest.py
diff --git a/gwasstudio/main.py b/gwasstudio/main.py
diff --git a/gwasstudio/methods/extract_snp.py b/gwasstudio/methods/extract_snp.py
diff --git a/gwasstudio/methods/locus_breaker.py b/gwasstudio/methods/locus_breaker.py
diff --git a/gwasstudio/test_snp_single_traitid_.txt b/gwasstudio/test_snp_single_traitid_.txt
diff --git a/gwasstudio/test_snp_traitid.txt b/gwasstudio/test_snp_traitid.txt
diff --git a/gwasstudio/utils/__init__.py b/gwasstudio/utils/__init__.py
diff --git a/pyproject.toml b/pyproject.toml