From 04b86728dc15f6893f30a79d2f296bc72f6e610a Mon Sep 17 00:00:00 2001
From: David Igbinedion <david.igbinedion@yahoo.com>
Date: Fri, 12 Jul 2024 17:22:17 +0100
Subject: [PATCH] added value for java options

---
 okapi/Chart.yaml  | 4 ----
 okapi/values.yaml | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/okapi/Chart.yaml b/okapi/Chart.yaml
index 18f7b24..2e3a97e 100644
--- a/okapi/Chart.yaml
+++ b/okapi/Chart.yaml
@@ -15,11 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-<<<<<<< HEAD
 version: 0.1.17
-=======
-version: 0.1.16
->>>>>>> c8bf3872deed1fdc9c6223ba177bce3948fa9a02
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/okapi/values.yaml b/okapi/values.yaml
index cb050a9..5ce5d35 100644
--- a/okapi/values.yaml
+++ b/okapi/values.yaml
@@ -25,11 +25,8 @@ clustered:
 # -- Specifies whether Okapi is deployed in cluster or dev mode
 
 mode: cluster
-<<<<<<< HEAD
 
 javaOptions: -Djava.awt.headless=true -Dlog4j.configurationFile=/etc/log4j2.xml -Dhost=$(POD_IP) -Dnodename=$(POD_NAME) -Dhazelcast.logging.type=log4j -Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.graceful.shutdown.max.wait=300 -Dlog4j2.formatMsgNoLookups=true
-=======
->>>>>>> c8bf3872deed1fdc9c6223ba177bce3948fa9a02
 # -- Okapi docker image 
 image:
   repository: folioorg/okapi