fixing helper from mergE

Signed-off-by: hfuss <[email protected]>
hyperledger · Aug 11, 2022 · e8117ea · e8117ea
1 parent 584721c
commit e8117ea
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/charts/firefly/templates/_helpers.tpl b/charts/firefly/templates/_helpers.tpl
@@ -166,17 +166,16 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/component: ethconnect
 {{- end }}
 
-<<<<<<< HEAD
 {{- define "firefly.sandboxSelectorLabels" -}}
 app.kubernetes.io/name: {{ include "firefly.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/component: sandbox
-=======
+{{- end }}
+
 {{- define "firefly.evmconnectSelectorLabels" -}}
 app.kubernetes.io/name: {{ include "firefly.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/component: evmconnect
->>>>>>> a3e9662 (outlining evmconnect)
 {{- end }}
 
 {{- define "firefly.ethconnectRegisterContractsJobName" -}}