Skip to content
Snippets Groups Projects
Commit 69e1ac03 authored by David Blyth's avatar David Blyth
Browse files

Oops, removed lingering merge conflict

parent 560b0773
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 5 deletions
Docker/Dockerfile
+ 0
− 5
View file @ 69e1ac03
......@@ -115,13 +115,8 @@ RUN git clone https://aur.archlinux.org/jdk.git && \
rm -rf jdk
# LCIO
<<<<<<< HEAD
ENV LCIO_VERSION 02-06
ENV LCIO_DIR /opt/LCIO
=======
ENV LCIO_VERSION 02-09
ENV LCIO_DIR /opt/LCIO
>>>>>>> fpadsim-1.4
RUN git clone https://github.com/iLCSoft/LCIO.git /opt/LCIO && \
cd $LCIO_DIR && \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment