fix merge conflicts

qbic-pipelines · Jan 8, 2025 · df64194 · df64194
2 parents c7d4a8b + bd07ec4
commit df64194
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "markdown.styles": ["public/vscode_markdown.css"]
+}
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 
 [![GitHub Actions CI Status](https://github.com/qbic-pipelines/vcftomat/actions/workflows/ci.yml/badge.svg)](https://github.com/qbic-pipelines/vcftomat/actions/workflows/ci.yml)
 [![GitHub Actions Linting Status](https://github.com/qbic-pipelines/vcftomat/actions/workflows/linting.yml/badge.svg)](https://github.com/qbic-pipelines/vcftomat/actions/workflows/linting.yml)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)
-
 [![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
 
 [![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)

diff --git a/nextflow_schema.json b/nextflow_schema.json
@@ -254,5 +254,13 @@
         {
             "$ref": "#/$defs/generic_options"
         }
-    ]
+    ],
+    "properties": {
+        "fai": {
+            "type": "string"
+        },
+        "dict": {
+            "type": "string"
+        }
+    }
 }
diff --git a/tests/default.nf.test.snap b/tests/default.nf.test.snap
@@ -101,4 +101,4 @@
         },
         "timestamp": "2024-12-20T12:10:25.903469"
     }
-}
+}
diff --git a/tests/full.nf.test.snap b/tests/full.nf.test.snap
@@ -212,4 +212,4 @@
         },
         "timestamp": "2024-12-20T12:12:11.055567"
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,4 +101,4 @@ @@
             },
             "timestamp": "2024-12-20T12:10:25.903469"
         }
-    }
+    }