Résolution de conflits

nextflow

src/.docker_modules/r-bolero/1.0/Dockerfile

src/.docker_modules/r-docher-test/1.0/Dockerfile

src/.docker_modules/r-docher-test/1.0/install_pkgs.R

...modules/r-docher-test/1.0/start_positions_individuals_2.R

src/bolero.nf

src/nextflow.config

src/nextflow_XGR.config

src/nf_modules/guppy-gpu/main.nf

src/nf_modules/ont-guppy/main.nf