Fix merge conflict.

openwdl · Apr 22, 2024 · e508a26 · e508a26
2 parents 764001b + aa0817d
commit e508a26
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -24,3 +24,7 @@ RUN cargo +nightly build
 RUN conda install -y -c conda-forge miniwdl
 RUN conda install -y -c conda-forge cromwell
 RUN cargo install sprocket
+RUN conda install -y -c conda-forge \
+    cromwell \
+    miniwdl \
+    shellcheck