Skip to content
Snippets Groups Projects
Commit eaebd34c authored by Amandine PERRIN's avatar Amandine PERRIN
Browse files

update merged dockerfile

parent cde122ca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
containers/Dockerfile
+ 0
− 4
View file @ eaebd34c
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment