Merge 4.2 into master

2021-09-30 16:50:34 -03:00
parent 61b44c37cc
commit 503db33dde
1 changed files with 0 additions and 5 deletions
@@ -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