Skip to content

Commit

Permalink
Merge pull request #8 from LouisLeNezet/dev
Browse files Browse the repository at this point in the history
Resolve merged conflict of #4
  • Loading branch information
LouisLeNezet authored Mar 19, 2024
2 parents ce3cc27 + dd33a32 commit bb21ad5
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@
"bcftools/index": {
"branch": "master",
"git_sha": "44096c08ffdbc694f5f92ae174ea0f7ba0f37e09",
"installed_by": [
"modules",
"multiple_impute_glimpse2",
"vcf_impute_glimpse",
"vcf_phase_shapeit5"
]
"installed_by": ["multiple_impute_glimpse2", "vcf_impute_glimpse", "vcf_phase_shapeit5"]
},
"bcftools/mpileup": {
"branch": "master",
Expand Down Expand Up @@ -56,7 +51,7 @@
"glimpse/chunk": {
"branch": "master",
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
"installed_by": ["modules", "vcf_impute_glimpse"]
"installed_by": ["vcf_impute_glimpse"]
},
"glimpse/ligate": {
"branch": "master",
Expand Down Expand Up @@ -141,7 +136,7 @@
"nf-core": {
"multiple_impute_glimpse2": {
"branch": "master",
"git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f",
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
"installed_by": ["subworkflows"]
},
"utils_nextflow_pipeline": {
Expand All @@ -166,7 +161,7 @@
},
"vcf_phase_shapeit5": {
"branch": "master",
"git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f",
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
"installed_by": ["subworkflows"]
}
}
Expand Down

0 comments on commit bb21ad5

Please sign in to comment.