From: seshukm <seshu.kumar.m@huawei.com>
Date: Mon, 4 May 2020 09:53:38 +0000 (+0530)
Subject: resolve the build failure in frankfurt
X-Git-Tag: 1.6.1~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F107048%2F1;p=so.git

resolve the build failure in frankfurt

Issue-ID: SO-2872

Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I24a10c1eafb1e570a5b697e8a1ebc6a819dff56d
---

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 4d60279ae8..37e8bab560 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -251,7 +251,6 @@
             <image>
              <name>${docker.image.prefix}/nssmf-adapter</name>
               <build>
-<<<<<<< HEAD   (f360ba resolve problem CreateCommunicationService SST is null)
                <cleanup>try</cleanup>
                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                <tags>