From dd071ebc655801665b14a798757548f6a04f2b05 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 16 Nov 2018 11:48:16 +0100 Subject: Fix cherry-pick mistakes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I891a8bb9f1440688dd17bda750d6e9fca17eb7a6 Signed-off-by: Cédric Ollivier --- docker/vnf/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 46e5212d6..198f098c0 100644 --- 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 -- cgit 1.2.3-korg