From 503db33dde67b6eadb77a6807b7b3a2ec5705fd2 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 30 Sep 2021 16:50:34 -0300
Subject: [PATCH] Merge 4.2 into master

---
 production_cluster/ssl_certs/certs.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/production_cluster/ssl_certs/certs.yml b/production_cluster/ssl_certs/certs.yml
index d9551f05..486e4178 100644
--- a/production_cluster/ssl_certs/certs.yml
+++ b/production_cluster/ssl_certs/certs.yml
@@ -27,13 +27,8 @@ nodes:
   - name: filebeat
     dn: CN=filebeat,OU=Ops,O=Example\, Inc.,DC=example,DC=com
     dns: 
-<<<<<<< HEAD
       - wazuh
 
-=======
-      - wazuh 
-      
->>>>>>> f34b7d0465dbc8bf717d81e2bc4f13f44a03a55d
 clients:
   - name: admin
     dn: CN=admin,OU=Ops,O=Example\, Inc.,DC=example,DC=com