Resolve conflicts

This commit is contained in:
vcerenu
2024-10-17 12:34:40 -03:00
parent 42977e3131
commit 7ca14b9fc8

View File

@@ -10,15 +10,9 @@ on:
required: true
docker_reference:
description: 'wazuh-docker reference'
<<<<<<< HEAD
default: 'v4.10.0'
required: false
products:
=======
default: 'v4.10.1'
required: true
PRODUCTS:
>>>>>>> 46d6dc8fe58467e679fc57a86a5fe99394628b87
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
required: true