From ccfd13d6721c56bec9ce0940f3ecaf8efd9d02f6 Mon Sep 17 00:00:00 2001
From: mtgag <githreg@mtg.de>
Date: Sun, 25 Feb 2024 14:43:28 +0100
Subject: [PATCH] resolved conflict issue

---
 v3/integration/small.config.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/v3/integration/small.config.json b/v3/integration/small.config.json
index 73785fd40..621242602 100644
--- a/v3/integration/small.config.json
+++ b/v3/integration/small.config.json
@@ -430,12 +430,9 @@
     "w_tls_server_cert_valid_time_longer_than_397_days": {},
     "w_rfc_dnsname_underscore_in_trd": {
       "WarnCount": 13
-<<<<<<< HEAD
-=======
     },
     "w_sub_cert_aia_contains_internal_names": {
       "WarnCount": 7
->>>>>>> 45de88040a22e2db4d962de9ec3847dcac59be92
     }
   }
 }
\ No newline at end of file