Merge branch '20765-moving-gvcf-regions'

refs #20765

Arvados-DCO-1.1-Signed-off-by: Alex Coleman <alex.coleman@curii.com>

diff --cc docker/cgivar2vcfbed/Dockerfile
index 986bdba21314aa32a5bf3d3c4ce2e1ed81cab1be,f6aa205c860660be718b4f20155ca31a5f4e1bc2..8fe60a22929b0b322f845553bfb6214570f2e9e2
--- 1/docker/cgivar2vcfbed/Dockerfile
--- 2/docker/cgivar2vcfbed/Dockerfile
+++ b/docker/cgivar2vcfbed/Dockerfile
@@@ -34,6 -40,4 +40,8 @@@ RUN wget https://github.com/arq5x/bedto
  
  WORKDIR /
  
- # Installing gvcf_regions
  
++<<<<<<< HEAD
 +RUN git clone https://github.com/acoleman2000/gvcf_regions
++=======
++>>>>>>> 20765-moving-gvcf-regions

diff --cc docker/vcfutil/Dockerfile
index 409fb8a5bce543696b0a3695a9dad4bbfcb1be41,38cdedb80961f2a7290290c22731d3991584a4a8..17cab80006eadb19f36ac8f9c4521898e6359ba1
--- 1/docker/vcfutil/Dockerfile
--- 2/docker/vcfutil/Dockerfile
+++ b/docker/vcfutil/Dockerfile
@@@ -2,6 -2,10 +2,13 @@@
  #
  # SPDX-License-Identifier: AGPL-3.0
  
++<<<<<<< HEAD
++=======
+ # build instruction:
+ # docker build -t dockername --file=/path/to/lightning/docker/vcfutil/Dockerfile /path/to/lightning
+ 
+ 
++>>>>>>> 20765-moving-gvcf-regions
  FROM python:3.11-buster
  
  USER root