merge ready.

Signed-off-by: Strigix <[email protected]>
falcosecurity · Jun 17, 2024 · 9e97c03 · 9e97c03
1 parent f6d65d3
commit 9e97c03
Showing 1 changed file with 0 additions and 8 deletions.
diff --git 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