Resolving conflicts

Correcting issue #7
flaviobarros · Sep 17, 2016 · c49670f · c49670f
1 parent e449e32
commit c49670f
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,17 +9,8 @@ RUN apt-get update && apt-get install -y \
     pandoc-citeproc \
     libcurl4-gnutls-dev \
     libcairo2-dev/unstable \
-<<<<<<< HEAD
-    libxt-dev
-
-# Download and install libssl 0.9.8
-RUN wget --no-verbose http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl0.9.8_0.9.8o-4squeeze14_amd64.deb && \
-    dpkg -i libssl0.9.8_0.9.8o-4squeeze14_amd64.deb && \
-    rm -f libssl0.9.8_0.9.8o-4squeeze14_amd64.deb
-=======
     libxt-dev \
     libssl-dev
->>>>>>> b708d8227b6b3c18f4baa4ef7d6b1cb5d34f8792
 
 # Download and install shiny server
 RUN wget --no-verbose https://s3.amazonaws.com/rstudio-shiny-server-os-build/ubuntu-12.04/x86_64/VERSION -O "version.txt" && \