Conflicts resolution

This commit is contained in:
Gonzalo Acuña
2025-06-19 12:28:14 -03:00
32 changed files with 841 additions and 601 deletions
+2 -2
View File
@@ -138,7 +138,7 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit
│   │   ├── wazuh2.indexer.yml
│   │   └── wazuh3.indexer.yml
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   ├── generate-certs.yml
│   ├── Migration-to-Wazuh-4.4.md
│   ├── README.md
│   └── volume-migrator.sh
@@ -157,7 +157,7 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit
│   │   │   └── wazuh.indexer.yml
│   │   └── wazuh_indexer_ssl_certs [error opening dir]
│   ├── docker-compose.yml
│   ├── generate-indexer-certs.yml
│   ├── generate-certs.yml
│   └── README.md
├── VERSION.json
└── wazuh-agent