chore: Upgrade to 0.15.1 (#81)

paradedb · Feb 6, 2025 · b0cd048 · b0cd048
1 parent 02e16a5
commit b0cd048
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml b/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml
@@ -1,26 +1,10 @@
 type: paradedb-enterprise
 mode: standalone
-<<<<<<< HEAD
-<<<<<<< HEAD
 version:
   major: "17"
-<<<<<<< HEAD
   paradedb: "0.15.1"
-=======
-  paradedb: "0.15.0"
->>>>>>> 0d458f5 (chore: Upgrade to 0.15.0 (#80))
 cluster:
   instances: 2
-=======
-
-=======
-version:
-  major: "16"
-  paradedb: "0.12.2"
->>>>>>> 406ebd3 (Fixed cron database name (#61))
-cluster:
-  instances: 1
->>>>>>> 9d8a308 (ParadeDB Enterprise (#58))
   storage:
     size: 256Mi
   imagePullSecrets: