Resolve "Upgrade elasticsearch-kibana package to 7.10.X versions"

Summary

(Summarize the purpose of the MR)

Relevant logs/screenshots

(Include any relevant logs/screenshots)

/cc @someoneelse

Closes #224 (closed)

chart/values.yaml

@@ -172,7 +172,11 @@ logging:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git
     path: "./chart"
+<<<<<<< HEAD
     tag: "0.1.7-bb.0"
+=======
+    branch: "bb-224"
+>>>>>>> 9c34635 (Point to WIP branch bb-224 for logging in values.yaml)
 
   sso:
     # -- Toggle OIDC SSO for Kibana/Elasticsearch on and off.