Fixed typos

wazuh · Jun 12, 2024 · 6f4ebb2 · 6f4ebb2
1 parent 0918a19
commit 6f4ebb2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- Support to 4.9.0 Wazuh release. 
+- Support to 4.9.0 Wazuh release.
 
 ## Wazuh Puppet v4.8.1
 

diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp
@@ -557,11 +557,7 @@
       $keys_group = 'Administrators'
 
       $agent_service  = 'WazuhSvc'
-<<<<<<< HEAD
       $agent_package  = 'Wazuh Agent 4.9.0'
-=======
-      $agent_package  = 'Wazuh Agent 4.8.1'
->>>>>>> 4.8.1
       $server_service = ''
       $server_package = ''
       $api_service = ''