Skip to content

Commit 5ebbbd1

Browse files
johanneskoesterjohanneskoester
committed
fixed conflict
1 parent 3f0f1ba commit 5ebbbd1

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<<<<<<< HEAD
21
FROM snakemake/snakemake:v5.12.1
3-
=======
4-
FROM snakemake/snakemake:v5.9.1
5-
>>>>>>> 7a6aebe4bbd8d01247a1997e451d6a4bb75ea54d
62
COPY entrypoint.sh /entrypoint.sh
73
ENTRYPOINT ["/entrypoint.sh"]

0 commit comments

Comments
 (0)