summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseshukm <seshu.kumar.m@huawei.com>2020-05-04 15:23:38 +0530
committerseshukm <seshu.kumar.m@huawei.com>2020-05-04 15:23:38 +0530
commite85779319cb0ab13340a97abe9dd0400af37f268 (patch)
treea9055216b315bb6ef5de9b18486af1c0d5a21a32
parentceb48c98197ecafd5a302d7e10c1f70fbe2c1048 (diff)
resolve the build failure in frankfurt
Issue-ID: SO-2872 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: I24a10c1eafb1e570a5b697e8a1ebc6a819dff56d
-rw-r--r--packages/docker/pom.xml1
1 files changed, 0 insertions, 1 deletions
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>