Sync changes from `development` with removal of merge conflicts

AlexsLemonade / scpca-nf

scpca-nf is the Nextflow workflow for processing Single-cell Pediatric Cancer Atlas Portal data

BSD 3-Clause "New" or "Revised" License

12 stars 2 forks source link

Sync changes from `development` with removal of merge conflicts #752

Closed allyhawkins closed 6 months ago

allyhawkins commented 6 months ago

Let's see if this solves the issues with #750. Merging this would merge all changes from development into main + resolve merge conflicts that are present between the two branches right now.

allyhawkins commented 6 months ago

@sjspielman can you re-approve? This is the same as #750 I just fixed two conflicts.