From d0a3c082b09493dd5b3e3fec20d2ae894d5852b8 Mon Sep 17 00:00:00 2001
From: Christopher Kolstad <chriswk@getunleash.io>
Date: Wed, 27 Mar 2024 09:02:46 +0100
Subject: [PATCH] feat: Release 2.4.0 with Edge 18.0.1

---
 charts/unleash-edge/Chart.yaml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/charts/unleash-edge/Chart.yaml b/charts/unleash-edge/Chart.yaml
index 4fdc334..a0b6059 100644
--- a/charts/unleash-edge/Chart.yaml
+++ b/charts/unleash-edge/Chart.yaml
@@ -4,15 +4,9 @@ name: unleash-edge
 description: A Helm chart for deploying Unleash Edge to kubernetes
 icon: https://docs.getunleash.io/img/logo.svg
 type: application
-version: 2.3.1
+version: 2.4.0
 
-<<<<<<< HEAD
-appVersion: "v17.1.0"
-||||||| parent of 329c11a (chore: update Unleash Edge to most recent version)
-appVersion: "v16.0.6"
-=======
-appVersion: "v17.0.0"
->>>>>>> 329c11a (chore: update Unleash Edge to most recent version)
+appVersion: "v18.0.1"
 maintainers:
   - name: chriswk
   - name: sighphyre