resolve conflicts

goreflect · Mar 22, 2020 · 5485719 · 5485719
1 parent 1830c8f
commit 5485719
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/go.sum b/go.sum
@@ -25,4 +25,5 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/lib.go b/lib.go
@@ -15,7 +15,7 @@ func ConfigureEasy(
 		infra.FunctionSetupEnvironment,
 		infra.FunctionSetupHocon,
 		infra.FunctionSetupDefault,
-	}, pipeline.EmptyAdditionalPrefix, pipeline.DurtyConfiguring)
+	}, pipeline.EmptyAdditionalPrefix, pipeline.DirtyConfiguring)
 }
 
 /*
@@ -26,7 +26,7 @@ func ConfigureSetup(
 	fileName string,
 	prefix string,
 	functions []infra.FuncType) (interface{}, error) {
-	return pipeline.Configure(structure, fileName, functions, prefix, pipeline.DurtyConfiguring)
+	return pipeline.Configure(structure, fileName, functions, prefix, pipeline.DirtyConfiguring)
 }
 
 /*