From 56b77528f8aa0403e6c32cd282dc711bd46b5963 Mon Sep 17 00:00:00 2001
From: kostas-theo <ktheo@oneconcern.com>
Date: Fri, 30 Apr 2021 19:14:20 +0200
Subject: [PATCH] fix: readd lost commits

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 insertions(+)

diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 7525904f..0cd5c4b2 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,11 @@
 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