diff options
| -rw-r--r-- | packages/docker/pom.xml | 1 |
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> |