Fix mismerge

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

helm/examples/certmanager/README.md

@@ -197,4 +197,4 @@ You should see a result similar to this:
 
 The default public issuer uses self signed certificates. This makes it very easy to set up but browsers
 will not recognize the certificates as trustworthy and the browser will warn users that the connection
-is not safe.
+is not safe.

helm/examples/secrets/password

@@ -1 +1 @@
-password
+password

helm/examples/secrets/url-basic

@@ -1 +1 @@
-https://postman-echo.com/basic-auth
+https://postman-echo.com/basic-auth

helm/examples/secrets/username

@@ -1 +1 @@
-postman
+postman

helm/hpcc/docs/placements.md

@@ -79,4 +79,4 @@ placements:
       operator: "Equal"
       value: "true"
       effect: "NoSchedule"
-```
+```

helm/hpcc/templates/_helpers.tpl

@@ -1081,7 +1081,7 @@ kind: Service
 metadata:
   name: {{ .name | quote }}
   labels:
-    helmVersion: 8.2.0-rc3
+    helmVersion: 8.4.0-closedown0
 {{- if $lvars.labels }}
 {{ toYaml $lvars.labels | indent 4 }}
 {{- end }}

helm/managed/README.md

@@ -1,2 +1,2 @@
 ## HPCC Systems Managed Helm Charts
-This directory contains external helm charts and HPCC managed default values
+This directory contains external helm charts and HPCC managed default values