Fix cherry-pick mistakes

Change-Id: I891a8bb9f1440688dd17bda750d6e9fca17eb7a6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 46e5212..198f098 100644 (file)
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,14 +1,8 @@
 FROM opnfv/functest-core:hunter
 
-<<<<<<< HEAD
 ARG BRANCH=stable/hunter
 ARG OPENSTACK_TAG=stable/rocky
-ARG VIMS_TEST_TAG=release-129
-=======
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
 ARG VIMS_TEST_TAG=release-130
->>>>>>> 3ac3d8d... Switch to Clearwater Zamin (heat_ims)
 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
 ARG CLOUDIFY_VIMS_TAG=fraser
 ARG HEAT_VIMS_TAG=release-130