From d41e97067edf5b4d4670398992e740fac0244ba0 Mon Sep 17 00:00:00 2001
From: kostas-theo <ktheo@oneconcern.com>
Date: Mon, 3 May 2021 18:47:13 +0200
Subject: [PATCH] fix: feat not fix

Signed-off-by: kostas-theo <ktheo@oneconcern.com>

Signed-off-by: kostas-theo <ktheo@oneconcern.com>
---
 charts/argo-events/Chart.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 0cd5c4b2..7525904f 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,11 +1,7 @@
 apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-<<<<<<< HEAD
 version: 1.4.0
-=======
-version: 1.3.4
->>>>>>> bf91403 (fix: readd lost commits)
 keywords:
   - argo-events
   - sensor-controller