Fix conflict in #1023

2018-03-14 14:32:54 -04:00 · 2018-03-14 14:32:54 -04:00 · d673b1cd73
parent 451530f9c2 cda4927a85
commit d673b1cd73
1 changed files with 4 additions and 0 deletions
--- a/4
+++ b/4
@ -49,7 +49,11 @@ RUN apt-get update && apt-get install -qy \

 # build empire from source
 # TODO: When we merge to master set branch to master
+<<<<<<< HEAD
 RUN git clone -b master https://github.com/EmpireProject/Empire.git /opt/Empire && \
+=======
+RUN git clone --depth=1 -b dev https://github.com/EmpireProject/Empire.git /opt/Empire && \
+>>>>>>> cda4927a8567add6801a72c83fb156b54397865e
    cd /opt/Empire/setup/ && \
    ./install.sh && \
    rm -rf /opt/Empire/data/empire*