From 7e7bc580b231c5e77ed4dcfdf7ee62a69c615032 Mon Sep 17 00:00:00 2001
From: jonny <git@ervine.org>
Date: Sat, 26 Mar 2022 15:10:52 +0000
Subject: [PATCH] 'update files with ansible'

---
 karma/values.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/karma/values.yaml b/karma/values.yaml
index 107d28e..e861bc8 100644
--- a/karma/values.yaml
+++ b/karma/values.yaml
@@ -66,7 +66,4 @@ tolerations: []
 
 affinity: {}
 
-<<<<<<< HEAD
 alertmanager_url: "http://alertmanager-main:9093"
-=======
->>>>>>> a689aca1f423ff32b1461cde47af31059dba5ae9