From e85779319cb0ab13340a97abe9dd0400af37f268 Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Mon, 4 May 2020 15:23:38 +0530
Subject: resolve the build failure in frankfurt

Issue-ID: SO-2872

Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I24a10c1eafb1e570a5b697e8a1ebc6a819dff56d
---
 packages/docker/pom.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/docker/pom.xml')

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>
-- 
cgit 1.2.3-korg