From 9e97c033ed3631efa625c9671beb2ea9c04bb22d Mon Sep 17 00:00:00 2001
From: Strigix <stefan@vtveld.nl>
Date: Mon, 17 Jun 2024 08:40:10 +0200
Subject: [PATCH] merge ready.

Signed-off-by: Strigix <stefan@vtveld.nl>
---
 charts/falco/CHANGELOG.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/charts/falco/CHANGELOG.md b/charts/falco/CHANGELOG.md
index 761ffda14..5224cfdd2 100644
--- a/charts/falco/CHANGELOG.md
+++ b/charts/falco/CHANGELOG.md
@@ -2,18 +2,10 @@
 
 This file documents all notable changes to Falco Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
-<<<<<<< HEAD
 
 ## v4.4.2
 
 * fix wrong check in pod template where `existingSecret` was used instead of `existingClientSecret`
-
-## v4.4.1
-=======
->>>>>>> 37ac7de (Added the controller.labels field for extra deploment/daemonset labeling.)
-
-## v4.4.2
-
 * Added a `labels` field in the controller to provide extra labeling for the daemonset/deployment
 
 ## v4.4.1