From eaebd34c8ee49dc44edab7395411748a0c4801d6 Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Mon, 10 Jul 2023 10:40:07 +0200
Subject: [PATCH] update merged dockerfile
---
containers/Dockerfile | 4 ----
1 file changed, 4 deletions(-)
diff --git a/containers/Dockerfile b/containers/Dockerfile
index df7d9e28..5c617870 100644
--- a/containers/Dockerfile
+++ b/containers/Dockerfile
@@ -141,11 +141,7 @@ RUN apt-get install -y automake &&\
WORKDIR /install_dir/FastME/tarball
RUN tar xzf fastme-2.1.6.4.tar.gz &&\
rm fastme-2.1.6.4.tar.gz &&\
-<<<<<<< HEAD
- ln -s /install_dir/FastME/tarball/fastme-2.1.6.2/binaries/fastme-2.1.6.4-linux64-omp /usr/local/bin/fastme
-=======
ln -s /install_dir/FastME/tarball/fastme-2.1.6.4/binaries/fastme-2.1.6.2-linux64-omp /usr/local/bin/fastme
->>>>>>> dev
# Install quicktree
WORKDIR /install_dir
--
GitLab