From acdebafdf6134e35961aac222541d995915b2a21 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Thu, 4 Oct 2018 17:37:19 +0200 Subject: [PATCH] Merge error? Signed-off-by: David Gageot --- pkg/skaffold/schema/v1alpha3/config.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/skaffold/schema/v1alpha3/config.go b/pkg/skaffold/schema/v1alpha3/config.go index 35cf08cff54..cb35735b426 100644 --- a/pkg/skaffold/schema/v1alpha3/config.go +++ b/pkg/skaffold/schema/v1alpha3/config.go @@ -201,10 +201,9 @@ type HelmConventionConfig struct { // Artifact represents items that need to be built, along with the context in which // they should be built. type Artifact struct { - ImageName string `yaml:"imageName"` - Workspace string `yaml:"workspace,omitempty"` - ArtifactType `yaml:",inline"` - StructureTestFiles []string `yaml:"structureTestFiles"` + ImageName string `yaml:"imageName"` + Workspace string `yaml:"workspace,omitempty"` + ArtifactType `yaml:",inline"` } // Profile is additional configuration that overrides default