mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-10-31 03:53:32 +00:00 
			
		
		
		
	Resolving conflicts
This commit is contained in:
		| @@ -13,7 +13,10 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION} | |||||||
| # Foundation. | # Foundation. | ||||||
|  |  | ||||||
| WAZUH_IMAGE_VERSION="5.0.0" | WAZUH_IMAGE_VERSION="5.0.0" | ||||||
|  | WAZUH_TAG_REVISION="1" | ||||||
|  | WAZUH_DEV_STAGE="" | ||||||
| FILEBEAT_MODULE_VERSION="0.4" | FILEBEAT_MODULE_VERSION="0.4" | ||||||
|  |  | ||||||
| # ----------------------------------------------------------------------------- | # ----------------------------------------------------------------------------- | ||||||
|  |  | ||||||
| trap ctrl_c INT | trap ctrl_c INT | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user