Removing merge conflict message
Change-Id: I1499e11dfc21df7121494860e66261c409813059
diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index acd06a8..bb67187 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -42,11 +42,7 @@
RUN ./app-install.sh
# Create the final image coping over the installed applications from the build stage
-<<<<<<< HEAD
-FROM onosproject/onos:1.10.6
-=======
FROM onosproject/onos:1.10.8
->>>>>>> 61cc60f... [CORD-2111 Updating ONOS to 1.10.8]
# Install Key Store Options
ENV JAVA_OPTS="${JAVA_OPTS:--DenableOFTLS=true -Djavax.net.ssl.keyStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.keyStorePassword=222222 -Djavax.net.ssl.trustStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.trustStorePassword=222222}"
@@ -69,5 +65,3 @@
# Create ONOS Key Directory
RUN mkdir -p /home/sdn/wiki
COPY docker/onos_cfg/ /home/sdn/wiki
-
-