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 4d60279..37e8bab 100644 (file)
--- 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>